From 76b30718ff745117ac7422d4160356dce851c2d2 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@example.com>
Date: Fri, 17 Jul 2026 22:43:11 +0100
Subject: [PATCH 01/12] feat(events): replace push-based select_winners with
 pull-model claim_prize for unlimited winners (#61)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

select_winners for ReleaseKind::Single (bounties, hackathons) previously
paid every winner inline — N × (token transfer + 3 cross-contract calls)
in one transaction, capped at 50 to stay under Soroban's per-tx budget.

Now select_winners only records winner records. Each winner calls
claim_prize() in their own transaction to receive their payout, matching
the existing claim_milestone pattern already used for Grants/Crowdfunding.

Changes:
- select_winners Single branch: record winners without paying inline
- Add claim_prize(): token release + profile calls per-winner per-tx
- Add PrizeClaimed DataKey + event + storage for claim idempotency
- Raise MAX_WINNERS_PER_SELECT from 50 to 5000 (pull-model is cheaper)
- 180 tests pass, snapshots updated
---
 contracts/events/src/errors.rs                |   3 +
 contracts/events/src/event_ops.rs             | 191 +++-
 contracts/events/src/events.rs                |   8 +
 contracts/events/src/lib.rs                   |  11 +
 contracts/events/src/storage.rs               |  21 +
 contracts/events/src/tests/bounty_pillar.rs   |   4 +
 contracts/events/src/tests/cancel_refund.rs   |   3 +
 contracts/events/src/tests/contributions.rs   |   3 +
 contracts/events/src/tests/cross_contract.rs  |  42 +-
 contracts/events/src/tests/escrow_fee_math.rs |  10 +
 .../events/src/tests/hackathon_pillar.rs      |  53 +-
 contracts/events/src/types.rs                 |   4 +
 .../apply_upgrade_after_expiry_reverts.1.json |   4 +-
 ...ply_upgrade_before_timelock_reverts.1.json |   4 +-
 ...cel_pending_upgrade_clears_proposal.1.json |   2 +-
 ...e_upgrade_records_pending_and_emits.1.json |   4 +-
 .../apply_after_deadline_reverts.1.json       |   6 +-
 ...traps_profile_and_records_applicant.1.json |  16 +-
 .../apply_on_cancelled_event_reverts.1.json   |  12 +-
 .../apply_on_completed_event_reverts.1.json   | 290 +++++-
 .../apply_on_wrong_pillar_reverts.1.json      |   6 +-
 .../apply_requires_applicant_auth.1.json      |  16 +-
 .../apply_when_paused_reverts.1.json          |   6 +-
 .../duplicate_apply_reverts.1.json            |  16 +-
 ...replayed_apply_reverts_idempotently.1.json |  16 +-
 ...layed_withdraw_reverts_idempotently.1.json |  22 +-
 .../withdraw_after_submit_reverts.1.json      |  22 +-
 .../withdraw_removes_the_applicant.1.json     |  22 +-
 .../withdraw_requires_applicant_auth.1.json   |  22 +-
 .../withdraw_when_paused_reverts.1.json       |  16 +-
 .../withdraw_without_apply_reverts.1.json     |   6 +-
 ...d_funds_on_cancelling_event_reverts.1.json |  18 +-
 ...g_across_partners_no_owner_residual.1.json | 322 ++++++-
 ...tributor_amount_zeroed_after_cancel.1.json |  30 +-
 ...e_cancel_before_all_batches_reverts.1.json |  30 +-
 ...en_residual_pays_partners_and_owner.1.json |  36 +-
 .../owner_only_cancel_settles_inline.1.json   |  12 +-
 ...nalize_rejected_after_inline_settle.1.json |  12 +-
 .../paged_cancel_processes_in_batches.1.json  |  66 +-
 ..._cancel_batch_without_start_reverts.1.json |   6 +-
 ...cancel_on_already_cancelled_reverts.1.json |  12 +-
 .../add_funds_paged_storage_round_trip.1.json |  24 +-
 ...dd_funds_to_cancelled_event_reverts.1.json |  12 +-
 .../anyone_can_top_up_an_active_event.1.json  |  12 +-
 .../below_minimum_contribution_reverts.1.json |  12 +-
 ...ays_partners_full_no_owner_residual.1.json | 322 ++++++-
 ...or_amounts_so_replay_state_is_clean.1.json |  30 +-
 ..._contributors_refunds_owner_in_full.1.json |  12 +-
 ...top_up_keeps_owner_residual_correct.1.json |  36 +-
 ...efunds_partners_then_owner_residual.1.json |  36 +-
 ...r_aggregate_and_dont_duplicate_list.1.json |  18 +-
 ...ithout_recording_contribution_entry.1.json |  12 +-
 ...cel_owner_only_settles_inside_start.1.json |  12 +-
 .../paged_cancel_processes_in_batches.1.json  |  66 +-
 .../replayed_add_funds_reverts.1.json         |  12 +-
 ...ro_or_negative_contribution_reverts.1.json |   6 +-
 ...unds_uses_event_override_not_global.1.json |  12 +-
 ...y_submit_requires_prior_application.1.json |   6 +-
 .../bounty_submit_succeeds_after_apply.1.json |  22 +-
 ...lect_winners_refunds_only_remaining.1.json | 290 +++++-
 .../cancel_already_cancelled_reverts.1.json   |  12 +-
 ...l_refunds_remaining_escrow_to_owner.1.json |  12 +-
 ...nal_milestone_marks_event_completed.1.json |  48 +-
 ...mpotent_per_recipient_and_milestone.1.json |  48 +-
 ...one_invalid_milestone_index_reverts.1.json |  12 +-
 ...milestone_pays_per_milestone_amount.1.json |  30 +-
 ..._milestone_rejects_non_grant_events.1.json | 346 +------
 ...charges_override_rate_when_provided.1.json |   6 +-
 ...erride_falls_back_to_global_default.1.json |   6 +-
 ...te_event_with_waiver_charges_no_fee.1.json |   6 +-
 ...t_milestone_sweeps_rounding_residue.1.json |  66 +-
 ..._creates_anchor_without_prior_apply.1.json |  12 +-
 .../manager_can_be_rotated.1.json             |   6 +-
 ...s_to_owner_and_override_is_recorded.1.json |  12 +-
 ...manager_override_can_select_winners.1.json | 290 +++++-
 ...iginal_submitted_at_and_updates_uri.1.json |  18 +-
 ...andles_multi_recipient_distribution.1.json | 550 ++++++++++-
 ..._remaining_escrow_including_top_ups.1.json | 286 +++++-
 ...rs_pays_recipient_and_bumps_profile.1.json | 290 +++++-
 ..._winners_rejects_duplicate_position.1.json |   6 +-
 ...econd_call_winners_already_selected.1.json |  12 +-
 .../select_winners_replayed_reverts.1.json    | 340 +------
 ...s_requires_position_in_distribution.1.json |   6 +-
 .../submit_replayed_reverts.1.json            |  12 +-
 .../withdraw_submission_removes_anchor.1.json |  18 +-
 ...bmission_without_submission_reverts.1.json |   6 +-
 ...xactly_pledge_and_creator_bears_fee.1.json |  32 +-
 ...does_not_appear_in_contributor_list.1.json |  12 +-
 ...r_partial_claim_pro_rates_remaining.1.json |  56 +-
 ...unds_all_partners_no_owner_residual.1.json |  36 +-
 ..._contributions_just_marks_cancelled.1.json |  12 +-
 ...milestone_last_drains_dust_with_fee.1.json |  72 +-
 ...laim_milestone_out_of_range_reverts.1.json |  12 +-
 .../claim_milestone_replay_reverts.1.json     |  32 +-
 ...s_evenly_and_charges_fee_at_release.1.json |  72 +-
 ...milestone_with_empty_escrow_reverts.1.json |   6 +-
 ...nity_top_ups_raise_escrow_from_zero.1.json |  18 +-
 ..._deposit_and_auto_registered_winner.1.json |   6 +-
 ...claim_milestone_requires_admin_auth.1.json |  32 +-
 ...ect_winners_on_crowdfunding_reverts.1.json |   6 +-
 .../submit_on_crowdfunding_reverts.1.json     |   6 +-
 .../add_funds_uses_event_override_bps.1.json  |  12 +-
 ...ds_zero_override_bps_charges_no_fee.1.json |  12 +-
 ...rowdfunding_dynamic_milestone_split.1.json |  72 +-
 ...owdfunding_dynamic_rounding_no_dust.1.json |  72 +-
 ...mulates_across_create_and_add_funds.1.json |  12 +-
 .../fee_and_winner_balances_consistent.1.json | 286 +++++-
 .../fee_rounding_on_odd_amounts.1.json        |   6 +-
 ...ee_rounds_down_non_divisible_amount.1.json |   6 +-
 ...lobal_fee_bps_used_when_no_override.1.json |   6 +-
 ...ant_milestone_double_claim_rejected.1.json |  30 +-
 ...ant_milestone_out_of_range_rejected.1.json |  12 +-
 ...ilestone_pays_floored_per_milestone.1.json |  66 +-
 .../large_budget_fee_does_not_overflow.1.json |   6 +-
 ...ange_does_not_affect_override_event.1.json |  12 +-
 ...position_split_pays_correct_amounts.1.json | 858 +++++++++++++++++-
 ...erride_at_max_bps_boundary_succeeds.1.json |   6 +-
 .../override_bps_used_on_create.1.json        |   6 +-
 ...osition_fill_leaves_residual_escrow.1.json | 280 +++++-
 .../partner_funds_grow_winner_payout.1.json   | 286 +++++-
 .../replayed_create_event_reverts.1.json      |   6 +-
 .../replayed_select_winners_reverts.1.json    | 340 +------
 ..._winners_duplicate_position_reverts.1.json |   6 +-
 .../select_winners_empty_list_reverts.1.json  |   6 +-
 ...ct_winners_invalid_position_reverts.1.json |   6 +-
 ..._winners_on_cancelled_event_reverts.1.json |  12 +-
 .../select_winners_twice_reverts.1.json       | 340 +------
 ...se_pays_full_escrow_for_100_percent.1.json | 280 +++++-
 .../three_way_33_33_34_split_rounding.1.json  | 858 +++++++++++++++++-
 ...obal_bps_no_override_charges_no_fee.1.json |   6 +-
 .../zero_override_bps_skips_fee.1.json        |   6 +-
 ...m_milestone_already_claimed_reverts.1.json |  30 +-
 ..._earns_credits_and_bumps_reputation.1.json |  30 +-
 ...estone_last_sweeps_rounding_residue.1.json |  66 +-
 ...m_milestone_marks_completed_on_last.1.json |  48 +-
 ...milestone_on_single_release_reverts.1.json |   6 +-
 .../claim_milestone_op_replay_reverts.1.json  |  30 +-
 ...laim_milestone_out_of_range_reverts.1.json |  12 +-
 ...one_pays_fixed_per_milestone_amount.1.json |  30 +-
 ...estone_without_being_winner_reverts.1.json |   6 +-
 ..._create_with_multi_release_succeeds.1.json |   6 +-
 ...inner_grant_each_claims_their_share.1.json |  84 +-
 ...on_single_release_hackathon_reverts.1.json |   6 +-
 ...ull_budget_and_takes_fee_at_deposit.1.json |   6 +-
 ..._original_timestamp_and_updates_uri.1.json |  18 +-
 .../select_winners_demands_owner_auth.1.json  | 547 +----------
 ..._winners_duplicate_position_reverts.1.json |   6 +-
 .../select_winners_empty_set_reverts.1.json   |   6 +-
 ...lti_position_splits_by_distribution.1.json | 858 +++++++++++++++++-
 ..._winners_on_completed_event_reverts.1.json | 281 +++++-
 ...osition_not_in_distribution_reverts.1.json |   6 +-
 .../select_winners_replayed_op_reverts.1.json | 340 +------
 ...ll_reverts_winners_already_selected.1.json | 338 +------
 ...ners_single_recipient_sweeps_escrow.1.json | 280 +++++-
 .../submit_after_deadline_reverts.1.json      |   6 +-
 ..._without_prior_apply_creates_anchor.1.json |  12 +-
 .../submit_replayed_op_reverts.1.json         |  12 +-
 .../withdraw_submission_removes_anchor.1.json |  18 +-
 158 files changed, 8040 insertions(+), 4183 deletions(-)

diff --git a/contracts/events/src/errors.rs b/contracts/events/src/errors.rs
index ca38b93..55a8177 100644
--- a/contracts/events/src/errors.rs
+++ b/contracts/events/src/errors.rs
@@ -83,4 +83,7 @@ pub enum Error {
 
     // Cross-contract
     ProfileCallFailed = 80,
+
+    // Prize claims (pull-model for Single-release events)
+    PrizeAlreadyClaimed = 91,
 }
diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index b820751..906f98b 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -22,7 +22,15 @@ use crate::types::{
 };
 
 const MAX_TITLE_LEN: u32 = 120;
-const MAX_WINNERS_PER_SELECT: u32 = 50;
+
+// Max winners per select_winners call. With the pull-model (2026-07),
+// select_winners only records winners (1 storage write each) and defers
+// all token transfers + cross-contract calls to per-winner claim_prize
+// transactions. This makes the per-winner cost negligible, so the cap is
+// raised from 50 to 5_000 (matching MAX_APPLICANTS_PER_EVENT / MAX_CONTRIBUTORS_PER_EVENT
+// for consistency). The practical ceiling is now the storage footprint of
+// the winner list rather than the per-tx execution budget.
+pub const MAX_WINNERS_PER_SELECT: u32 = 5_000;
 
 // Per-event list caps. Lifted from 100 to 5_000 once paged cancel landed:
 // start_cancel / process_cancel_batch / finalize_cancel split the refund
@@ -614,7 +622,7 @@ pub fn select_winners(
     admin::require_not_paused(env)?;
     idempotency::require_unseen(env, &op_id)?;
 
-    let mut event = storage::get_event(env, event_id).ok_or(Error::EventNotFound)?;
+    let event = storage::get_event(env, event_id).ok_or(Error::EventNotFound)?;
     if !matches!(event.status, EventStatus::Active) {
         return Err(Error::EventNotActive);
     }
@@ -663,21 +671,20 @@ pub fn select_winners(
         seen_positions.push_back(spec.position);
     }
 
-    let profile = profile_client::client(env);
-    let now = env.ledger().timestamp();
-    let reason_win = Symbol::new(env, "win");
-
     match event.release_kind {
         ReleaseKind::Single => {
-            // M1: percent math is against the live escrow at select time
-            // (snapshotted before the first refund), so partner top-ups via
-            // add_funds flow into winner payouts rather than getting
-            // trapped until cancel. Snapshot once so each winner gets the
-            // intended share regardless of the order of releases inside
-            // this same call.
+            // Pull-model (2026-07): record winners with pre-computed amounts
+            // but defer all token releases + profile calls to claim_prize.
+            // This removes the per-call winner ceiling that the old push model
+            // imposed (MAX_WINNERS_PER_SELECT = 50) — each winner now claims
+            // their prize in their own transaction, so no single transaction
+            // carries N × (token transfer + 3 cross-contract invocations).
+            //
+            // M1 math (percent of escrow_at_select) is preserved here at
+            // record time so the amounts are locked in before any
+            // post-selection add_funds can bias them.
             let escrow_at_select = event.remaining_escrow;
 
-            // First pass: compute per-winner amounts and verify total fits.
             let mut total_owed: i128 = 0;
             for spec in winners.iter() {
                 let percent = event
@@ -694,34 +701,15 @@ pub fn select_winners(
                 return Err(Error::InsufficientEscrow);
             }
 
-            // Second pass: release per winner with all four profile-side calls.
-            for (idx, spec) in winners.iter().enumerate() {
-                let sub_idx = idx as u8;
+            // Record winners but DON'T drain escrow or call the profile
+            // contract. Those happen in claim_prize.
+            for spec in winners.iter() {
                 let percent = event
                     .winner_distribution
                     .get(spec.position)
                     .ok_or(Error::InvalidDistribution)? as i128;
                 let amount = escrow_at_select.saturating_mul(percent) / 100_i128;
 
-                escrow::release(env, &event.token, &spec.recipient, amount);
-                event.remaining_escrow = event.remaining_escrow.saturating_sub(amount);
-
-                let bootstrap_op =
-                    idempotency::derive_child_indexed(env, &op_id, tag::BOOTSTRAP, sub_idx);
-                profile.bootstrap(&spec.recipient, &bootstrap_op);
-
-                let rep_op = idempotency::derive_child_indexed(env, &op_id, tag::BUMP_REP, sub_idx);
-                profile.bump_reputation(
-                    &spec.recipient,
-                    &spec.reputation_bump,
-                    &reason_win,
-                    &rep_op,
-                );
-
-                let earnings_op =
-                    idempotency::derive_child_indexed(env, &op_id, tag::REGISTER_EARNINGS, sub_idx);
-                profile.register_earnings(&spec.recipient, &event.token, &amount, &earnings_op);
-
                 storage::append_winner(
                     env,
                     event_id,
@@ -730,22 +718,9 @@ pub fn select_winners(
                         position: spec.position,
                         amount,
                         milestone: None,
-                        paid_at: Some(now),
+                        paid_at: None, // set by claim_prize
                     },
                 );
-
-                evt::WinnerPaid {
-                    event_id,
-                    recipient: spec.recipient.clone(),
-                    position: spec.position,
-                    amount,
-                    milestone: None,
-                }
-                .publish(env);
-            }
-
-            if event.remaining_escrow == 0 {
-                event.status = EventStatus::Completed;
             }
         }
         ReleaseKind::Multi(_) => {
@@ -779,6 +754,122 @@ pub fn select_winners(
     Ok(())
 }
 
+// ============================================================
+// CLAIM PRIZE (pull-model for Single-release events)
+//
+// Each winner claims their individual prize in their own transaction,
+// so there is no per-call winner ceiling. select_winners records winners
+// with pre-computed amounts; this function releases the token, bumps
+// reputation, and registers earnings for one winner per call.
+//
+// This mirrors claim_milestone but for ReleaseKind::Single (bounties,
+// hackathons) instead of ReleaseKind::Multi (grants, crowdfunding).
+// ============================================================
+pub fn claim_prize(
+    env: &Env,
+    event_id: u64,
+    recipient: Address,
+    position: u32,
+    reputation_bump: u32,
+    op_id: BytesN<32>,
+) -> Result<(), Error> {
+    admin::require_not_paused(env)?;
+    idempotency::require_unseen(env, &op_id)?;
+
+    let mut event = storage::get_event(env, event_id).ok_or(Error::EventNotFound)?;
+    if !matches!(event.status, EventStatus::Active) {
+        return Err(Error::EventNotActive);
+    }
+    if !matches!(event.release_kind, ReleaseKind::Single) {
+        return Err(Error::InvalidReleaseKind);
+    }
+    if matches!(event.pillar, Pillar::Crowdfunding) {
+        return Err(Error::InvalidPillar);
+    }
+
+    recipient.require_auth();
+
+    // Prevent double-claim for this (event, recipient, position).
+    if storage::is_prize_claimed(env, event_id, &recipient, position) {
+        return Err(Error::PrizeAlreadyClaimed);
+    }
+
+    // Locate the anchor row (milestone == None) matching this recipient and
+    // position. The amount was pre-computed in select_winners.
+    let count = storage::winner_count(env, event_id);
+    let mut winner_amount: Option<i128> = None;
+    for idx in 0..count {
+        let w = match storage::winner_at(env, event_id, idx) {
+            Some(w) => w,
+            None => continue,
+        };
+        if w.recipient != recipient || w.position != position {
+            continue;
+        }
+        if w.milestone.is_none() {
+            winner_amount = Some(w.amount);
+            break;
+        }
+    }
+    let amount = winner_amount.ok_or(Error::NoSubmissions)?;
+
+    if amount <= 0 {
+        return Err(Error::InvalidDistribution);
+    }
+    if amount > event.remaining_escrow {
+        return Err(Error::InsufficientEscrow);
+    }
+
+    // Release token from escrow.
+    escrow::release(env, &event.token, &recipient, amount);
+    event.remaining_escrow = event.remaining_escrow.saturating_sub(amount);
+
+    // Cross-contract profile mutations. Each call gets a unique child op_id.
+    let profile = profile_client::client(env);
+    let reason_win = Symbol::new(env, "win");
+
+    let bootstrap_op = idempotency::derive_child(env, &op_id, tag::BOOTSTRAP);
+    profile.bootstrap(&recipient, &bootstrap_op);
+
+    let rep_op = idempotency::derive_child(env, &op_id, tag::BUMP_REP);
+    profile.bump_reputation(&recipient, &reputation_bump, &reason_win, &rep_op);
+
+    let earnings_op = idempotency::derive_child(env, &op_id, tag::REGISTER_EARNINGS);
+    profile.register_earnings(&recipient, &event.token, &amount, &earnings_op);
+
+    // Mark prize claimed (prevents replay for this recipient + position).
+    storage::mark_prize_claimed(env, event_id, &recipient, position);
+
+    // Append per-claim Winner row.
+    storage::append_winner(
+        env,
+        event_id,
+        &Winner {
+            recipient: recipient.clone(),
+            position,
+            amount,
+            milestone: None,
+            paid_at: Some(env.ledger().timestamp()),
+        },
+    );
+
+    if event.remaining_escrow == 0 {
+        event.status = EventStatus::Completed;
+    }
+    storage::set_event(env, event_id, &event);
+
+    evt::PrizeClaimed {
+        event_id,
+        recipient,
+        position,
+        amount,
+    }
+    .publish(env);
+
+    idempotency::mark_seen(env, &op_id);
+    Ok(())
+}
+
 // ============================================================
 // READS
 //
@@ -818,7 +909,7 @@ pub fn get_winners(env: &Env, event_id: u64) -> Result<Vec<Winner>, Error> {
     Ok(storage::winners_snapshot(
         env,
         event_id,
-        MAX_WINNERS_PER_SELECT.saturating_mul(20),
+        MAX_WINNERS_PER_SELECT,
     ))
 }
 
diff --git a/contracts/events/src/events.rs b/contracts/events/src/events.rs
index 91d253d..c234e22 100644
--- a/contracts/events/src/events.rs
+++ b/contracts/events/src/events.rs
@@ -90,6 +90,14 @@ pub struct WinnerPaid {
     pub milestone: Option<u32>,
 }
 
+#[contractevent]
+pub struct PrizeClaimed {
+    pub event_id: u64,
+    pub recipient: Address,
+    pub position: u32,
+    pub amount: i128,
+}
+
 #[contractevent]
 pub struct MilestoneClaimed {
     pub event_id: u64,
diff --git a/contracts/events/src/lib.rs b/contracts/events/src/lib.rs
index 959db86..0491680 100644
--- a/contracts/events/src/lib.rs
+++ b/contracts/events/src/lib.rs
@@ -237,6 +237,17 @@ impl EventsContract {
         event_ops::get_manager(&env, event_id)
     }
 
+    pub fn claim_prize(
+        env: Env,
+        event_id: u64,
+        recipient: Address,
+        position: u32,
+        reputation_bump: u32,
+        op_id: BytesN<32>,
+    ) -> Result<(), Error> {
+        event_ops::claim_prize(&env, event_id, recipient, position, reputation_bump, op_id)
+    }
+
     pub fn claim_milestone(
         env: Env,
         event_id: u64,
diff --git a/contracts/events/src/storage.rs b/contracts/events/src/storage.rs
index 4aaa9ed..9af268d 100644
--- a/contracts/events/src/storage.rs
+++ b/contracts/events/src/storage.rs
@@ -622,6 +622,27 @@ pub fn set_crowdfunding_milestones_claimed(env: &Env, id: u64, count: u32) {
     touch_event_persistent(env, &key);
 }
 
+// ============================================================
+// PRIZE CLAIMS (persistent; per-(event, recipient, position))
+//
+// Tracks which winners have claimed their prize in the pull-model flow for
+// Single-release events (bounties, hackathons). Written by claim_prize.
+// ============================================================
+pub fn is_prize_claimed(env: &Env, id: u64, recipient: &Address, position: u32) -> bool {
+    let key = DataKey::PrizeClaimed(id, recipient.clone(), position);
+    let claimed: Option<bool> = env.storage().persistent().get(&key);
+    if claimed.is_some() {
+        touch_event_persistent(env, &key);
+    }
+    claimed.unwrap_or(false)
+}
+
+pub fn mark_prize_claimed(env: &Env, id: u64, recipient: &Address, position: u32) {
+    let key = DataKey::PrizeClaimed(id, recipient.clone(), position);
+    env.storage().persistent().set(&key, &true);
+    touch_event_persistent(env, &key);
+}
+
 // ============================================================
 // CANCELLATION STATE (persistent; present only while Cancelling)
 // ============================================================
diff --git a/contracts/events/src/tests/bounty_pillar.rs b/contracts/events/src/tests/bounty_pillar.rs
index a537984..2d4906e 100644
--- a/contracts/events/src/tests/bounty_pillar.rs
+++ b/contracts/events/src/tests/bounty_pillar.rs
@@ -276,6 +276,10 @@ fn apply_on_completed_event_reverts() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
+    // Pull-model: claim prize to drain escrow and complete the event.
+    let claim_op = BytesN::random(&ctx.env);
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &0_u32, &claim_op);
+
     let event = ctx.events.get_event(&bounty_id);
     assert_eq!(event.status, EventStatus::Completed);
 
diff --git a/contracts/events/src/tests/cancel_refund.rs b/contracts/events/src/tests/cancel_refund.rs
index 9ce2e25..657076b 100644
--- a/contracts/events/src/tests/cancel_refund.rs
+++ b/contracts/events/src/tests/cancel_refund.rs
@@ -282,6 +282,9 @@ fn cancel_prorata_splits_remaining_across_partners_no_owner_residual() {
     ctx.events
         .select_winners(&id, &winners, &BytesN::random(&ctx.env));
 
+    // Pull-model: claim prize to drain escrow (60% of 2000 = 1200).
+    ctx.events.claim_prize(&id, &w, &1_u32, &0_u32, &BytesN::random(&ctx.env));
+
     let p1_before = token.balance(&p1);
     let p2_before = token.balance(&p2);
     let owner_before = token.balance(&ctx.owner);
diff --git a/contracts/events/src/tests/contributions.rs b/contracts/events/src/tests/contributions.rs
index 2e79193..5101c9b 100644
--- a/contracts/events/src/tests/contributions.rs
+++ b/contracts/events/src/tests/contributions.rs
@@ -411,6 +411,9 @@ fn cancel_at_boundary_pays_partners_full_no_owner_residual() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op_select);
 
+    // Pull-model: claim prize to drain 50% of escrow (1000).
+    ctx.events.claim_prize(&id, &winner_a, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+
     // The event isn't Completed because remaining (1000) != 0.
     let after_select = ctx.events.get_event(&id);
     assert_eq!(after_select.status, EventStatus::Active);
diff --git a/contracts/events/src/tests/cross_contract.rs b/contracts/events/src/tests/cross_contract.rs
index 8f9b6d6..3e5dd01 100644
--- a/contracts/events/src/tests/cross_contract.rs
+++ b/contracts/events/src/tests/cross_contract.rs
@@ -145,6 +145,10 @@ fn select_winners_pays_recipient_and_bumps_profile() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
+    // Pull-model: claim prize.
+    let claim_op = BytesN::random(&ctx.env);
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &50_u32, &claim_op);
+
     // Token: winner received the full budget (no second-layer fee on release).
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET);
@@ -164,15 +168,21 @@ fn select_winners_pays_recipient_and_bumps_profile() {
     assert_eq!(event.status, EventStatus::Completed);
     assert_eq!(event.remaining_escrow, 0);
 
-    // Winner record stored.
+    // Winner records: anchor + claim row.
     let winner_list = ctx.events.get_winners(&bounty_id);
-    assert_eq!(winner_list.len(), 1);
-    let recorded = winner_list.get(0).unwrap();
-    assert_eq!(recorded.recipient, ctx.applicant);
-    assert_eq!(recorded.position, 1);
-    assert_eq!(recorded.amount, TOTAL_BUDGET);
-    assert_eq!(recorded.milestone, None);
-    assert!(recorded.paid_at.is_some());
+    assert_eq!(winner_list.len(), 2);
+    let anchor = winner_list.get(0).unwrap();
+    assert_eq!(anchor.recipient, ctx.applicant);
+    assert_eq!(anchor.position, 1);
+    assert_eq!(anchor.amount, TOTAL_BUDGET);
+    assert_eq!(anchor.milestone, None);
+    assert!(anchor.paid_at.is_none());
+    let claim = winner_list.get(1).unwrap();
+    assert_eq!(claim.recipient, ctx.applicant);
+    assert_eq!(claim.position, 1);
+    assert_eq!(claim.amount, TOTAL_BUDGET);
+    assert_eq!(claim.milestone, None);
+    assert!(claim.paid_at.is_some());
 }
 
 #[test]
@@ -283,6 +293,10 @@ fn select_winners_handles_multi_recipient_distribution() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
+    // Pull-model: each winner claims their prize.
+    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&bounty_id, &winner_b, &2_u32, &25_u32, &BytesN::random(&ctx.env));
+
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let amount_a = TOTAL_BUDGET * 60 / 100;
     let amount_b = TOTAL_BUDGET * 40 / 100;
@@ -379,7 +393,7 @@ fn cancel_after_select_winners_refunds_only_remaining() {
     let op_create = BytesN::random(&ctx.env);
     let bounty_id = ctx.events.create_event(&params, &op_create);
 
-    // Pay one winner (60%).
+    // Select winner for position 1 (60%).
     let winner_a = Address::generate(&ctx.env);
     let winners = soroban_sdk::vec![
         &ctx.env,
@@ -392,6 +406,10 @@ fn cancel_after_select_winners_refunds_only_remaining() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
+    // Pull-model: winner claims their prize (60%).
+    let claim_op = BytesN::random(&ctx.env);
+    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &50_u32, &claim_op);
+
     // Now cancel — owner should get the remaining 40%.
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let owner_before = token.balance(&ctx.owner);
@@ -1023,6 +1041,9 @@ fn select_winners_pays_against_remaining_escrow_including_top_ups() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
+    // Pull-model: claim prize.
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     // Winner receives the full live escrow at select time, not the
     // original total_budget.
@@ -1103,6 +1124,9 @@ fn manager_override_can_select_winners() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
+    // Pull-model: claim prize to drain escrow and complete the event.
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &0_u32, &BytesN::random(&ctx.env));
+
     // Managed event settled via the manager authority.
     let event = ctx.events.get_event(&bounty_id);
     assert_eq!(event.status, EventStatus::Completed);
diff --git a/contracts/events/src/tests/escrow_fee_math.rs b/contracts/events/src/tests/escrow_fee_math.rs
index 502d76a..34ac27f 100644
--- a/contracts/events/src/tests/escrow_fee_math.rs
+++ b/contracts/events/src/tests/escrow_fee_math.rs
@@ -394,6 +394,7 @@ fn single_release_pays_full_escrow_for_100_percent() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
+    ctx.events.claim_prize(&id, &winner, &1_u32, &50_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&winner), TOTAL_BUDGET);
@@ -435,6 +436,9 @@ fn multi_position_split_pays_correct_amounts() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
+    ctx.events.claim_prize(&id, &w1, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w2, &2_u32, &30_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w3, &3_u32, &20_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let escrow = TOTAL_BUDGET; // all positions filled at create time
@@ -479,6 +483,9 @@ fn three_way_33_33_34_split_rounding() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
+    ctx.events.claim_prize(&id, &w1, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w2, &2_u32, &30_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w3, &3_u32, &20_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let escrow = TOTAL_BUDGET;
@@ -514,6 +521,7 @@ fn partial_position_fill_leaves_residual_escrow() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
+    ctx.events.claim_prize(&id, &w1, &1_u32, &50_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&w1), TOTAL_BUDGET * 60 / 100);
@@ -556,6 +564,7 @@ fn partner_funds_grow_winner_payout() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
+    ctx.events.claim_prize(&id, &winner, &1_u32, &50_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&winner), escrow_at_select);
@@ -1086,6 +1095,7 @@ fn fee_and_winner_balances_consistent() {
     ];
     let op_sel = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op_sel);
+    ctx.events.claim_prize(&id, &winner, &1_u32, &50_u32, &BytesN::random(&ctx.env));
 
     assert_eq!(token.balance(&winner), escrow);
     assert_eq!(token.balance(&ctx.fee_account), create_fee + contrib_fee);
diff --git a/contracts/events/src/tests/hackathon_pillar.rs b/contracts/events/src/tests/hackathon_pillar.rs
index ab6d21a..cc5b348 100644
--- a/contracts/events/src/tests/hackathon_pillar.rs
+++ b/contracts/events/src/tests/hackathon_pillar.rs
@@ -333,8 +333,12 @@ fn select_winners_single_recipient_sweeps_escrow() {
             reputation_bump: 50,
         },
     ];
-    let op = BytesN::random(&ctx.env);
-    ctx.events.select_winners(&id, &winners, &op);
+    let op_select = BytesN::random(&ctx.env);
+    ctx.events.select_winners(&id, &winners, &op_select);
+
+    // Pull-model: claim prize in winner's own transaction.
+    let claim_op = BytesN::random(&ctx.env);
+    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &50_u32, &claim_op);
 
     // Recipient delta: full budget. Fee account delta: 0 — the fee was taken
     // at deposit, never a second time on release.
@@ -354,14 +358,23 @@ fn select_winners_single_recipient_sweeps_escrow() {
     assert_eq!(event.status, EventStatus::Completed);
     assert_eq!(event.remaining_escrow, 0);
 
+    // Two winner rows: anchor (from select_winners) + claim row (from claim_prize).
     let winner_list = ctx.events.get_winners(&id);
-    assert_eq!(winner_list.len(), 1);
-    let w = winner_list.get(0).unwrap();
-    assert_eq!(w.recipient, ctx.applicant);
-    assert_eq!(w.position, 1);
-    assert_eq!(w.amount, TOTAL_BUDGET);
-    assert!(w.milestone.is_none());
-    assert!(w.paid_at.is_some());
+    assert_eq!(winner_list.len(), 2);
+    // Anchor row (select_winners): recorded but unpaid.
+    let anchor = winner_list.get(0).unwrap();
+    assert_eq!(anchor.recipient, ctx.applicant);
+    assert_eq!(anchor.position, 1);
+    assert_eq!(anchor.amount, TOTAL_BUDGET);
+    assert!(anchor.milestone.is_none());
+    assert!(anchor.paid_at.is_none());
+    // Claim row (claim_prize): paid.
+    let claim = winner_list.get(1).unwrap();
+    assert_eq!(claim.recipient, ctx.applicant);
+    assert_eq!(claim.position, 1);
+    assert_eq!(claim.amount, TOTAL_BUDGET);
+    assert!(claim.milestone.is_none());
+    assert!(claim.paid_at.is_some());
 }
 
 #[test]
@@ -395,13 +408,18 @@ fn select_winners_multi_position_splits_by_distribution() {
             reputation_bump: 20,
         },
     ];
-    let op = BytesN::random(&ctx.env);
-    ctx.events.select_winners(&id, &winners, &op);
+    let op_select = BytesN::random(&ctx.env);
+    ctx.events.select_winners(&id, &winners, &op_select);
 
     let amt_1 = TOTAL_BUDGET * 50 / 100;
     let amt_2 = TOTAL_BUDGET * 30 / 100;
     let amt_3 = TOTAL_BUDGET * 20 / 100;
 
+    // Pull-model: each winner claims their prize.
+    ctx.events.claim_prize(&id, &first, &1_u32, &60_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &second, &2_u32, &40_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &third, &3_u32, &20_u32, &BytesN::random(&ctx.env));
+
     // Recipient deltas across the split.
     assert_eq!(token.balance(&first), amt_1);
     assert_eq!(token.balance(&second), amt_2);
@@ -421,7 +439,8 @@ fn select_winners_multi_position_splits_by_distribution() {
     let event = ctx.events.get_event(&id);
     assert_eq!(event.status, EventStatus::Completed);
     assert_eq!(event.remaining_escrow, 0);
-    assert_eq!(ctx.events.get_winners(&id).len(), 3);
+    // 3 anchors + 3 claim rows = 6.
+    assert_eq!(ctx.events.get_winners(&id).len(), 6);
 }
 
 // ============================================================
@@ -567,8 +586,14 @@ fn select_winners_on_completed_event_reverts() {
             reputation_bump: 0,
         },
     ];
-    let op = BytesN::random(&ctx.env);
-    ctx.events.select_winners(&id, &winners, &op);
+    let op_select = BytesN::random(&ctx.env);
+    ctx.events.select_winners(&id, &winners, &op_select);
+    // Pull-model: event stays Active until claim.
+    assert_eq!(ctx.events.get_event(&id).status, EventStatus::Active);
+
+    // Claim to drain escrow and complete the event.
+    let claim_op = BytesN::random(&ctx.env);
+    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &0_u32, &claim_op);
     assert_eq!(ctx.events.get_event(&id).status, EventStatus::Completed);
 
     let again = Address::generate(&ctx.env);
diff --git a/contracts/events/src/types.rs b/contracts/events/src/types.rs
index 99c2c6e..4a4565a 100644
--- a/contracts/events/src/types.rs
+++ b/contracts/events/src/types.rs
@@ -249,6 +249,10 @@ pub enum DataKey {
     // Grant milestone tracking: (event_id, recipient, milestone) -> bool
     MilestoneClaimed(u64, Address, u32),
 
+    // Prize claim tracking for Single-release (bounty/hackathon) pull-model:
+    // (event_id, recipient, position) -> bool. Written by claim_prize.
+    PrizeClaimed(u64, Address, u32),
+
     // Crowdfunding: count of milestones already claimed against an event.
     // Used by the dynamic-payout math (amount = remaining_escrow /
     // (total_milestones - claimed_count)). Only written/read for
diff --git a/contracts/events/test_snapshots/tests/admin/apply_upgrade_after_expiry_reverts.1.json b/contracts/events/test_snapshots/tests/admin/apply_upgrade_after_expiry_reverts.1.json
index 3dc83dc..de02458 100644
--- a/contracts/events/test_snapshots/tests/admin/apply_upgrade_after_expiry_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/admin/apply_upgrade_after_expiry_reverts.1.json
@@ -16,7 +16,7 @@
               "function_name": "propose_upgrade",
               "args": [
                 {
-                  "bytes": "61718c967377126344f8e4d086c7602fb73d81809a10e19883f2bd3fab7a3082"
+                  "bytes": "c175f59a1a363f8d4ceba1035e3a00370e3ae5c871a9427cf57712a74d5019ac"
                 },
                 {
                   "string": "0.3.0"
@@ -203,7 +203,7 @@
                                 "symbol": "wasm_hash"
                               },
                               "val": {
-                                "bytes": "61718c967377126344f8e4d086c7602fb73d81809a10e19883f2bd3fab7a3082"
+                                "bytes": "c175f59a1a363f8d4ceba1035e3a00370e3ae5c871a9427cf57712a74d5019ac"
                               }
                             }
                           ]
diff --git a/contracts/events/test_snapshots/tests/admin/apply_upgrade_before_timelock_reverts.1.json b/contracts/events/test_snapshots/tests/admin/apply_upgrade_before_timelock_reverts.1.json
index 8896308..88d61eb 100644
--- a/contracts/events/test_snapshots/tests/admin/apply_upgrade_before_timelock_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/admin/apply_upgrade_before_timelock_reverts.1.json
@@ -16,7 +16,7 @@
               "function_name": "propose_upgrade",
               "args": [
                 {
-                  "bytes": "f547c265e9b7f4dac39d15968a68a2e22a5413371be16abc34027364a73e1410"
+                  "bytes": "96cecd9806ffeac44fcbc7e2efae0731279433ab1f0d994a315ca1dd0caa5240"
                 },
                 {
                   "string": "0.3.0"
@@ -204,7 +204,7 @@
                                 "symbol": "wasm_hash"
                               },
                               "val": {
-                                "bytes": "f547c265e9b7f4dac39d15968a68a2e22a5413371be16abc34027364a73e1410"
+                                "bytes": "96cecd9806ffeac44fcbc7e2efae0731279433ab1f0d994a315ca1dd0caa5240"
                               }
                             }
                           ]
diff --git a/contracts/events/test_snapshots/tests/admin/cancel_pending_upgrade_clears_proposal.1.json b/contracts/events/test_snapshots/tests/admin/cancel_pending_upgrade_clears_proposal.1.json
index 3aa08f4..aee587f 100644
--- a/contracts/events/test_snapshots/tests/admin/cancel_pending_upgrade_clears_proposal.1.json
+++ b/contracts/events/test_snapshots/tests/admin/cancel_pending_upgrade_clears_proposal.1.json
@@ -16,7 +16,7 @@
               "function_name": "propose_upgrade",
               "args": [
                 {
-                  "bytes": "2ba5162bad367eb2460f852b9adf7464d38cea3b563311a76e353429c0180c86"
+                  "bytes": "a0d86239203c4d7a6c9356895a868d693019ad228fb6d19f01dce3f9839de737"
                 },
                 {
                   "string": "0.3.0"
diff --git a/contracts/events/test_snapshots/tests/admin/propose_upgrade_records_pending_and_emits.1.json b/contracts/events/test_snapshots/tests/admin/propose_upgrade_records_pending_and_emits.1.json
index 97ac24d..c295f55 100644
--- a/contracts/events/test_snapshots/tests/admin/propose_upgrade_records_pending_and_emits.1.json
+++ b/contracts/events/test_snapshots/tests/admin/propose_upgrade_records_pending_and_emits.1.json
@@ -16,7 +16,7 @@
               "function_name": "propose_upgrade",
               "args": [
                 {
-                  "bytes": "d152291583d8d6d52657cad9428d5bf209dd184833562ac57a34732fa60ea262"
+                  "bytes": "36f2f3d0ee751c4d0e1aebcb1ca240f79355b7df3b5e9cd1073e420c617bce35"
                 },
                 {
                   "string": "0.3.0"
@@ -203,7 +203,7 @@
                                 "symbol": "wasm_hash"
                               },
                               "val": {
-                                "bytes": "d152291583d8d6d52657cad9428d5bf209dd184833562ac57a34732fa60ea262"
+                                "bytes": "36f2f3d0ee751c4d0e1aebcb1ca240f79355b7df3b5e9cd1073e420c617bce35"
                               }
                             }
                           ]
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_after_deadline_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_after_deadline_reverts.1.json
index e645d42..af19d21 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_after_deadline_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_after_deadline_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "511481fb9df254df99d55cba29888d6daadbef204d762df05ec62a5f593b6932"
+                  "bytes": "140a85d9e7aa3adadf450b279f0ea06b17ae1080794a8948a61cf40ebc848123"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "511481fb9df254df99d55cba29888d6daadbef204d762df05ec62a5f593b6932"
+                  "bytes": "140a85d9e7aa3adadf450b279f0ea06b17ae1080794a8948a61cf40ebc848123"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "511481fb9df254df99d55cba29888d6daadbef204d762df05ec62a5f593b6932"
+                      "bytes": "140a85d9e7aa3adadf450b279f0ea06b17ae1080794a8948a61cf40ebc848123"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_bootstraps_profile_and_records_applicant.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_bootstraps_profile_and_records_applicant.1.json
index 85f432e..982b2e5 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_bootstraps_profile_and_records_applicant.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_bootstraps_profile_and_records_applicant.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "27d6d09880d97a92f227470995fb18f3d3a02c258696719973ceab4b09b68d48"
+                  "bytes": "32c764f37fe8937ab4067e44093d3934e7f281605c8e144c76fd52db592611b0"
                 }
               ]
             }
@@ -270,7 +270,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "4387d7ec9a004c460805d344f266b36158d4045918f24a1d5b459d0da8d4f809"
+                  "bytes": "90026b21889d0c24ebb2fc0e9ecd50b83fe9c8c73bef7f9c6bf71918522aa682"
                 }
               ]
             }
@@ -396,7 +396,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f387d7ec9a004c460805d344f266b36158d4045918f24a1d5b459d0da8d4f809"
+                  "bytes": "20026b21889d0c24ebb2fc0e9ecd50b83fe9c8c73bef7f9c6bf71918522aa682"
                 }
               ]
             },
@@ -416,7 +416,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f387d7ec9a004c460805d344f266b36158d4045918f24a1d5b459d0da8d4f809"
+                      "bytes": "20026b21889d0c24ebb2fc0e9ecd50b83fe9c8c73bef7f9c6bf71918522aa682"
                     }
                   ]
                 },
@@ -953,7 +953,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "27d6d09880d97a92f227470995fb18f3d3a02c258696719973ceab4b09b68d48"
+                  "bytes": "32c764f37fe8937ab4067e44093d3934e7f281605c8e144c76fd52db592611b0"
                 }
               ]
             },
@@ -973,7 +973,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "27d6d09880d97a92f227470995fb18f3d3a02c258696719973ceab4b09b68d48"
+                      "bytes": "32c764f37fe8937ab4067e44093d3934e7f281605c8e144c76fd52db592611b0"
                     }
                   ]
                 },
@@ -998,7 +998,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4387d7ec9a004c460805d344f266b36158d4045918f24a1d5b459d0da8d4f809"
+                  "bytes": "90026b21889d0c24ebb2fc0e9ecd50b83fe9c8c73bef7f9c6bf71918522aa682"
                 }
               ]
             },
@@ -1018,7 +1018,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4387d7ec9a004c460805d344f266b36158d4045918f24a1d5b459d0da8d4f809"
+                      "bytes": "90026b21889d0c24ebb2fc0e9ecd50b83fe9c8c73bef7f9c6bf71918522aa682"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_cancelled_event_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_cancelled_event_reverts.1.json
index 41817d4..70dd308 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_cancelled_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_cancelled_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "6f6891adb354810bfcf7e01c434b3da3b12b5db08e238191c95b06b33c38074a"
+                  "bytes": "7a04cf4d53ed35221cea23f974874f9b4fe7c4a1b041e9e15ac38d426dedb948"
                 }
               ]
             }
@@ -266,7 +266,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "054e4794bd540099ccf046af64ad80cf54a14b646e5adb111792d2cd1c0e780b"
+                  "bytes": "15b5fe815ae2861949b85e1845bc192c0e9df034bc245c2ad4d9bc54260b1f96"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "054e4794bd540099ccf046af64ad80cf54a14b646e5adb111792d2cd1c0e780b"
+                  "bytes": "15b5fe815ae2861949b85e1845bc192c0e9df034bc245c2ad4d9bc54260b1f96"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "054e4794bd540099ccf046af64ad80cf54a14b646e5adb111792d2cd1c0e780b"
+                      "bytes": "15b5fe815ae2861949b85e1845bc192c0e9df034bc245c2ad4d9bc54260b1f96"
                     }
                   ]
                 },
@@ -740,7 +740,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6f6891adb354810bfcf7e01c434b3da3b12b5db08e238191c95b06b33c38074a"
+                  "bytes": "7a04cf4d53ed35221cea23f974874f9b4fe7c4a1b041e9e15ac38d426dedb948"
                 }
               ]
             },
@@ -760,7 +760,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6f6891adb354810bfcf7e01c434b3da3b12b5db08e238191c95b06b33c38074a"
+                      "bytes": "7a04cf4d53ed35221cea23f974874f9b4fe7c4a1b041e9e15ac38d426dedb948"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_completed_event_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_completed_event_reverts.1.json
index 9e605ce..8261506 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_completed_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_completed_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9d3b1aa8b13db667de6b84ac99a806a3a22aaaaaf3b3522d39eb04ad1683fd42"
+                  "bytes": "64e1374225bf22474da61a0d2f7d27d436526972ba3f9d295f86aaee3ceb561d"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "1ed21625c903537a6e8f27d8ec9b8b8a326943fbb2998ac035bbbe64f0cdeac3"
+                  "bytes": "6438b034b42789d32484a813c71e19aed316dd2d7dc27d511efea5b67be404a7"
                 }
               ]
             }
@@ -323,7 +323,38 @@
                   ]
                 },
                 {
-                  "bytes": "0369f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                  "bytes": "a8bc7268f896848ac88636c4cab455626cd11542639edc787ed1ef809d523fa9"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 0
+                },
+                {
+                  "bytes": "3ed2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                 }
               ]
             }
@@ -500,7 +531,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "aed21625c903537a6e8f27d8ec9b8b8a326943fbb2998ac035bbbe64f0cdeac3"
+                  "bytes": "8ed2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                 }
               ]
             },
@@ -520,7 +551,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "aed21625c903537a6e8f27d8ec9b8b8a326943fbb2998ac035bbbe64f0cdeac3"
+                      "bytes": "8ed2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                     }
                   ]
                 },
@@ -545,7 +576,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b369f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                  "bytes": "d438b034b42789d32484a813c71e19aed316dd2d7dc27d511efea5b67be404a7"
                 }
               ]
             },
@@ -565,7 +596,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b369f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                      "bytes": "d438b034b42789d32484a813c71e19aed316dd2d7dc27d511efea5b67be404a7"
                     }
                   ]
                 },
@@ -590,7 +621,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d269f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                  "bytes": "dfd2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                 }
               ]
             },
@@ -610,7 +641,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d269f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                      "bytes": "dfd2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                     }
                   ]
                 },
@@ -635,7 +666,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e269f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                  "bytes": "efd2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                 }
               ]
             },
@@ -655,7 +686,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e269f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                      "bytes": "efd2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                     }
                   ]
                 },
@@ -1223,6 +1254,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "100000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1308,7 +1427,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1327,7 +1446,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0369f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                  "bytes": "3ed2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                 }
               ]
             },
@@ -1347,7 +1466,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0369f774246d67c8b68bdca0b300a13db9d556591e606e396d87843c709428ba"
+                      "bytes": "3ed2a58de2d3502742da57b93302cf11707b09935c7c693ad0e2f5ca41f78845"
                     }
                   ]
                 },
@@ -1372,7 +1491,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1ed21625c903537a6e8f27d8ec9b8b8a326943fbb2998ac035bbbe64f0cdeac3"
+                  "bytes": "6438b034b42789d32484a813c71e19aed316dd2d7dc27d511efea5b67be404a7"
                 }
               ]
             },
@@ -1392,7 +1511,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1ed21625c903537a6e8f27d8ec9b8b8a326943fbb2998ac035bbbe64f0cdeac3"
+                      "bytes": "6438b034b42789d32484a813c71e19aed316dd2d7dc27d511efea5b67be404a7"
                     }
                   ]
                 },
@@ -1417,7 +1536,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9d3b1aa8b13db667de6b84ac99a806a3a22aaaaaf3b3522d39eb04ad1683fd42"
+                  "bytes": "64e1374225bf22474da61a0d2f7d27d436526972ba3f9d295f86aaee3ceb561d"
                 }
               ]
             },
@@ -1437,7 +1556,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9d3b1aa8b13db667de6b84ac99a806a3a22aaaaaf3b3522d39eb04ad1683fd42"
+                      "bytes": "64e1374225bf22474da61a0d2f7d27d436526972ba3f9d295f86aaee3ceb561d"
                     }
                   ]
                 },
@@ -1452,6 +1571,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "a8bc7268f896848ac88636c4cab455626cd11542639edc787ed1ef809d523fa9"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "a8bc7268f896848ac88636c4cab455626cd11542639edc787ed1ef809d523fa9"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1770,6 +1991,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_wrong_pillar_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_wrong_pillar_reverts.1.json
index f7eeeb4..41c8e68 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_wrong_pillar_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_on_wrong_pillar_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "e2d9707eb479c49983937a4ea6c70cd245b72d772f0e5dd819135d2d2cbacc52"
+                  "bytes": "dc1f8576c7cb6e3c0cdea75958ab795e8da5f23f96261ebe773b3c65307d6268"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e2d9707eb479c49983937a4ea6c70cd245b72d772f0e5dd819135d2d2cbacc52"
+                  "bytes": "dc1f8576c7cb6e3c0cdea75958ab795e8da5f23f96261ebe773b3c65307d6268"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e2d9707eb479c49983937a4ea6c70cd245b72d772f0e5dd819135d2d2cbacc52"
+                      "bytes": "dc1f8576c7cb6e3c0cdea75958ab795e8da5f23f96261ebe773b3c65307d6268"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_requires_applicant_auth.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_requires_applicant_auth.1.json
index 9c2a553..70bf95d 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_requires_applicant_auth.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_requires_applicant_auth.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9896982388a4e49efccd9537e279fbe015336a82eed8ae0ed7a5c0cce29697fc"
+                  "bytes": "3cc531c6147dc69d141a19b454104978046096820bc07a8181344f38221d5d83"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "a9f18daa30d881b3981c2b450c49b57f7191504358ed40e995f9ed6d7b2b84d9"
+                  "bytes": "da92d301b842cbff70ea4a7044cba29e663e5405d4707c28ebcad38f7b7f409d"
                 }
               ]
             }
@@ -393,7 +393,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "19f18daa30d881b3981c2b450c49b57f7191504358ed40e995f9ed6d7b2b84d9"
+                  "bytes": "6a92d301b842cbff70ea4a7044cba29e663e5405d4707c28ebcad38f7b7f409d"
                 }
               ]
             },
@@ -413,7 +413,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "19f18daa30d881b3981c2b450c49b57f7191504358ed40e995f9ed6d7b2b84d9"
+                      "bytes": "6a92d301b842cbff70ea4a7044cba29e663e5405d4707c28ebcad38f7b7f409d"
                     }
                   ]
                 },
@@ -950,7 +950,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9896982388a4e49efccd9537e279fbe015336a82eed8ae0ed7a5c0cce29697fc"
+                  "bytes": "3cc531c6147dc69d141a19b454104978046096820bc07a8181344f38221d5d83"
                 }
               ]
             },
@@ -970,7 +970,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9896982388a4e49efccd9537e279fbe015336a82eed8ae0ed7a5c0cce29697fc"
+                      "bytes": "3cc531c6147dc69d141a19b454104978046096820bc07a8181344f38221d5d83"
                     }
                   ]
                 },
@@ -995,7 +995,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a9f18daa30d881b3981c2b450c49b57f7191504358ed40e995f9ed6d7b2b84d9"
+                  "bytes": "da92d301b842cbff70ea4a7044cba29e663e5405d4707c28ebcad38f7b7f409d"
                 }
               ]
             },
@@ -1015,7 +1015,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a9f18daa30d881b3981c2b450c49b57f7191504358ed40e995f9ed6d7b2b84d9"
+                      "bytes": "da92d301b842cbff70ea4a7044cba29e663e5405d4707c28ebcad38f7b7f409d"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/apply_when_paused_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/apply_when_paused_reverts.1.json
index 2ef72df..55c4907 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/apply_when_paused_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/apply_when_paused_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "7de135640fdd734ea2ab9d2e208f969cdb091e1db04504094e0eda6fc04b6053"
+                  "bytes": "9e1c878bdf02a8d7357e1996dc97a9f1b9c6c5f4a48ecad812d10d659cc48e6b"
                 }
               ]
             }
@@ -720,7 +720,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7de135640fdd734ea2ab9d2e208f969cdb091e1db04504094e0eda6fc04b6053"
+                  "bytes": "9e1c878bdf02a8d7357e1996dc97a9f1b9c6c5f4a48ecad812d10d659cc48e6b"
                 }
               ]
             },
@@ -740,7 +740,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7de135640fdd734ea2ab9d2e208f969cdb091e1db04504094e0eda6fc04b6053"
+                      "bytes": "9e1c878bdf02a8d7357e1996dc97a9f1b9c6c5f4a48ecad812d10d659cc48e6b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/duplicate_apply_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/duplicate_apply_reverts.1.json
index 1fd859d..a7beaf1 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/duplicate_apply_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/duplicate_apply_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "73ffb76b2748c0d49829d20a7d8e50ae43b30c134a663cf05b9107a17ae5a42f"
+                  "bytes": "02044f7289080f0dcaa07998c8c5db9e6529611a4b96b20dfa09e107b3cb2cb0"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "3fa0a4ab0387df57bba6572314c8fbdc0e326201493d08a9cd4bb04e03332994"
+                  "bytes": "e6b1c0e1d619189e4088c4d1e69f6d5f97a38c24574b6f06ddb37a0f23b59277"
                 }
               ]
             }
@@ -394,7 +394,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8fa0a4ab0387df57bba6572314c8fbdc0e326201493d08a9cd4bb04e03332994"
+                  "bytes": "56b1c0e1d619189e4088c4d1e69f6d5f97a38c24574b6f06ddb37a0f23b59277"
                 }
               ]
             },
@@ -414,7 +414,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8fa0a4ab0387df57bba6572314c8fbdc0e326201493d08a9cd4bb04e03332994"
+                      "bytes": "56b1c0e1d619189e4088c4d1e69f6d5f97a38c24574b6f06ddb37a0f23b59277"
                     }
                   ]
                 },
@@ -951,7 +951,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3fa0a4ab0387df57bba6572314c8fbdc0e326201493d08a9cd4bb04e03332994"
+                  "bytes": "02044f7289080f0dcaa07998c8c5db9e6529611a4b96b20dfa09e107b3cb2cb0"
                 }
               ]
             },
@@ -971,7 +971,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3fa0a4ab0387df57bba6572314c8fbdc0e326201493d08a9cd4bb04e03332994"
+                      "bytes": "02044f7289080f0dcaa07998c8c5db9e6529611a4b96b20dfa09e107b3cb2cb0"
                     }
                   ]
                 },
@@ -996,7 +996,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "73ffb76b2748c0d49829d20a7d8e50ae43b30c134a663cf05b9107a17ae5a42f"
+                  "bytes": "e6b1c0e1d619189e4088c4d1e69f6d5f97a38c24574b6f06ddb37a0f23b59277"
                 }
               ]
             },
@@ -1016,7 +1016,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "73ffb76b2748c0d49829d20a7d8e50ae43b30c134a663cf05b9107a17ae5a42f"
+                      "bytes": "e6b1c0e1d619189e4088c4d1e69f6d5f97a38c24574b6f06ddb37a0f23b59277"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/replayed_apply_reverts_idempotently.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/replayed_apply_reverts_idempotently.1.json
index 8c5a4aa..c0c6136 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/replayed_apply_reverts_idempotently.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/replayed_apply_reverts_idempotently.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "535063a625b8465a1868226534ad785146e7827733d9b0e80c94b530f20d9f34"
+                  "bytes": "4603946cd37ad34aa553d976195e67557400ea0c761760aeeb2f57cd12b8de2e"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "ac97543a8757149802de15c2cbeabcfdc0039f418b6b71d975b6b483ab6b175e"
+                  "bytes": "3d9e3f4abe6740eed1c7706c042868240ee805e9318c239095d2e65f1f06aa5c"
                 }
               ]
             }
@@ -394,7 +394,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1c97543a8757149802de15c2cbeabcfdc0039f418b6b71d975b6b483ab6b175e"
+                  "bytes": "8d9e3f4abe6740eed1c7706c042868240ee805e9318c239095d2e65f1f06aa5c"
                 }
               ]
             },
@@ -414,7 +414,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1c97543a8757149802de15c2cbeabcfdc0039f418b6b71d975b6b483ab6b175e"
+                      "bytes": "8d9e3f4abe6740eed1c7706c042868240ee805e9318c239095d2e65f1f06aa5c"
                     }
                   ]
                 },
@@ -951,7 +951,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "535063a625b8465a1868226534ad785146e7827733d9b0e80c94b530f20d9f34"
+                  "bytes": "3d9e3f4abe6740eed1c7706c042868240ee805e9318c239095d2e65f1f06aa5c"
                 }
               ]
             },
@@ -971,7 +971,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "535063a625b8465a1868226534ad785146e7827733d9b0e80c94b530f20d9f34"
+                      "bytes": "3d9e3f4abe6740eed1c7706c042868240ee805e9318c239095d2e65f1f06aa5c"
                     }
                   ]
                 },
@@ -996,7 +996,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ac97543a8757149802de15c2cbeabcfdc0039f418b6b71d975b6b483ab6b175e"
+                  "bytes": "4603946cd37ad34aa553d976195e67557400ea0c761760aeeb2f57cd12b8de2e"
                 }
               ]
             },
@@ -1016,7 +1016,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ac97543a8757149802de15c2cbeabcfdc0039f418b6b71d975b6b483ab6b175e"
+                      "bytes": "4603946cd37ad34aa553d976195e67557400ea0c761760aeeb2f57cd12b8de2e"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/replayed_withdraw_reverts_idempotently.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/replayed_withdraw_reverts_idempotently.1.json
index 3dc53ca..ac69b7f 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/replayed_withdraw_reverts_idempotently.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/replayed_withdraw_reverts_idempotently.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9a4f9c67e0114675d37fcd3f96d9a23f4ba0b75209cbdf2fd138dfff9b7ccb05"
+                  "bytes": "e893e23795fb866f3b75a8988968f33f9f9f0984547e151135331391e6cdaf1a"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "a5bb7f4433a1ee3f647bded7d7046bde59237b3e14967539232c8dba7e39a119"
+                  "bytes": "dd339dd0f2cc52e3cd28c2563ebb065ae8588e49b923969e8ae2d548e7d2c1bf"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "39bc645a3ce38f53bae02f251263e94d4475fabccbe2e008ad8f8329482e9ab1"
+                  "bytes": "a3fa32abe3a6b7a61f671d8301789bbe77c6079f01a3570b721176cc42d73311"
                 }
               ]
             }
@@ -419,7 +419,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "15bb7f4433a1ee3f647bded7d7046bde59237b3e14967539232c8dba7e39a119"
+                  "bytes": "6d339dd0f2cc52e3cd28c2563ebb065ae8588e49b923969e8ae2d548e7d2c1bf"
                 }
               ]
             },
@@ -439,7 +439,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "15bb7f4433a1ee3f647bded7d7046bde59237b3e14967539232c8dba7e39a119"
+                      "bytes": "6d339dd0f2cc52e3cd28c2563ebb065ae8588e49b923969e8ae2d548e7d2c1bf"
                     }
                   ]
                 },
@@ -829,7 +829,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "39bc645a3ce38f53bae02f251263e94d4475fabccbe2e008ad8f8329482e9ab1"
+                  "bytes": "a3fa32abe3a6b7a61f671d8301789bbe77c6079f01a3570b721176cc42d73311"
                 }
               ]
             },
@@ -849,7 +849,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "39bc645a3ce38f53bae02f251263e94d4475fabccbe2e008ad8f8329482e9ab1"
+                      "bytes": "a3fa32abe3a6b7a61f671d8301789bbe77c6079f01a3570b721176cc42d73311"
                     }
                   ]
                 },
@@ -874,7 +874,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9a4f9c67e0114675d37fcd3f96d9a23f4ba0b75209cbdf2fd138dfff9b7ccb05"
+                  "bytes": "dd339dd0f2cc52e3cd28c2563ebb065ae8588e49b923969e8ae2d548e7d2c1bf"
                 }
               ]
             },
@@ -894,7 +894,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9a4f9c67e0114675d37fcd3f96d9a23f4ba0b75209cbdf2fd138dfff9b7ccb05"
+                      "bytes": "dd339dd0f2cc52e3cd28c2563ebb065ae8588e49b923969e8ae2d548e7d2c1bf"
                     }
                   ]
                 },
@@ -919,7 +919,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a5bb7f4433a1ee3f647bded7d7046bde59237b3e14967539232c8dba7e39a119"
+                  "bytes": "e893e23795fb866f3b75a8988968f33f9f9f0984547e151135331391e6cdaf1a"
                 }
               ]
             },
@@ -939,7 +939,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a5bb7f4433a1ee3f647bded7d7046bde59237b3e14967539232c8dba7e39a119"
+                      "bytes": "e893e23795fb866f3b75a8988968f33f9f9f0984547e151135331391e6cdaf1a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_after_submit_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_after_submit_reverts.1.json
index 260efa1..3c8714a 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_after_submit_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_after_submit_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "0bbffa4aecb124bc2b7ef3966621ce1ecdb54caf8fb4db7e6f3ba8b1461b54c0"
+                  "bytes": "2319caceab4253a016d81d3210fa660a2359e17bb42a5df2484789cf7b738fd2"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "b68513559d21108bf5a0d814b1ca0be30ebf678afb0ece18290a79154bfc48e7"
+                  "bytes": "c09ba86361208d6c65159dd749af4eea4f2f9f19f3016fbf5a9142d67797f2de"
                 }
               ]
             }
@@ -297,7 +297,7 @@
                   "string": "ipfs://Qm.../bounty.json"
                 },
                 {
-                  "bytes": "12d8ebaadc54711d6f8c3f9237867d8417981d0790712da82330926c8f2b29d3"
+                  "bytes": "fb52b754a5d36f9249a3366bc602fc3906ecf0c28e5047de84d5f334b93b0a89"
                 }
               ]
             }
@@ -422,7 +422,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "068513559d21108bf5a0d814b1ca0be30ebf678afb0ece18290a79154bfc48e7"
+                  "bytes": "709ba86361208d6c65159dd749af4eea4f2f9f19f3016fbf5a9142d67797f2de"
                 }
               ]
             },
@@ -442,7 +442,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "068513559d21108bf5a0d814b1ca0be30ebf678afb0ece18290a79154bfc48e7"
+                      "bytes": "709ba86361208d6c65159dd749af4eea4f2f9f19f3016fbf5a9142d67797f2de"
                     }
                   ]
                 },
@@ -1055,7 +1055,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0bbffa4aecb124bc2b7ef3966621ce1ecdb54caf8fb4db7e6f3ba8b1461b54c0"
+                  "bytes": "2319caceab4253a016d81d3210fa660a2359e17bb42a5df2484789cf7b738fd2"
                 }
               ]
             },
@@ -1075,7 +1075,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0bbffa4aecb124bc2b7ef3966621ce1ecdb54caf8fb4db7e6f3ba8b1461b54c0"
+                      "bytes": "2319caceab4253a016d81d3210fa660a2359e17bb42a5df2484789cf7b738fd2"
                     }
                   ]
                 },
@@ -1100,7 +1100,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "12d8ebaadc54711d6f8c3f9237867d8417981d0790712da82330926c8f2b29d3"
+                  "bytes": "c09ba86361208d6c65159dd749af4eea4f2f9f19f3016fbf5a9142d67797f2de"
                 }
               ]
             },
@@ -1120,7 +1120,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "12d8ebaadc54711d6f8c3f9237867d8417981d0790712da82330926c8f2b29d3"
+                      "bytes": "c09ba86361208d6c65159dd749af4eea4f2f9f19f3016fbf5a9142d67797f2de"
                     }
                   ]
                 },
@@ -1145,7 +1145,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b68513559d21108bf5a0d814b1ca0be30ebf678afb0ece18290a79154bfc48e7"
+                  "bytes": "fb52b754a5d36f9249a3366bc602fc3906ecf0c28e5047de84d5f334b93b0a89"
                 }
               ]
             },
@@ -1165,7 +1165,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b68513559d21108bf5a0d814b1ca0be30ebf678afb0ece18290a79154bfc48e7"
+                      "bytes": "fb52b754a5d36f9249a3366bc602fc3906ecf0c28e5047de84d5f334b93b0a89"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_removes_the_applicant.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_removes_the_applicant.1.json
index 8ee508f..cfed394 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_removes_the_applicant.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_removes_the_applicant.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "abd8746ba4d6cbcaf8197efeabccc18f80bce96542cd438af6254927072d15a8"
+                  "bytes": "fdd4463fc0248cfb6f01e34447fe4d8152d92d249975d5c203d4de7ff9c06c9e"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "17d438b9a4b8c9d8125ed4336784e45b5f3db904c15c8778643b662ed9bb1f08"
+                  "bytes": "9464ef8c063d1175b9e7d5c6dcf32b087a1fbe2295ff90657d29da92bfdb0872"
                 }
               ]
             }
@@ -295,7 +295,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "b4b690164ba7b6a27c71b5064e0bc254bc09993d26f86f0b4fc0709b1be64deb"
+                  "bytes": "984271b9c5bf97d01fa0e84f355dc28771199732424217d2f0655ee022a014ce"
                 }
               ]
             }
@@ -420,7 +420,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a7d438b9a4b8c9d8125ed4336784e45b5f3db904c15c8778643b662ed9bb1f08"
+                  "bytes": "2464ef8c063d1175b9e7d5c6dcf32b087a1fbe2295ff90657d29da92bfdb0872"
                 }
               ]
             },
@@ -440,7 +440,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a7d438b9a4b8c9d8125ed4336784e45b5f3db904c15c8778643b662ed9bb1f08"
+                      "bytes": "2464ef8c063d1175b9e7d5c6dcf32b087a1fbe2295ff90657d29da92bfdb0872"
                     }
                   ]
                 },
@@ -830,7 +830,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "17d438b9a4b8c9d8125ed4336784e45b5f3db904c15c8778643b662ed9bb1f08"
+                  "bytes": "9464ef8c063d1175b9e7d5c6dcf32b087a1fbe2295ff90657d29da92bfdb0872"
                 }
               ]
             },
@@ -850,7 +850,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "17d438b9a4b8c9d8125ed4336784e45b5f3db904c15c8778643b662ed9bb1f08"
+                      "bytes": "9464ef8c063d1175b9e7d5c6dcf32b087a1fbe2295ff90657d29da92bfdb0872"
                     }
                   ]
                 },
@@ -875,7 +875,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "abd8746ba4d6cbcaf8197efeabccc18f80bce96542cd438af6254927072d15a8"
+                  "bytes": "984271b9c5bf97d01fa0e84f355dc28771199732424217d2f0655ee022a014ce"
                 }
               ]
             },
@@ -895,7 +895,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "abd8746ba4d6cbcaf8197efeabccc18f80bce96542cd438af6254927072d15a8"
+                      "bytes": "984271b9c5bf97d01fa0e84f355dc28771199732424217d2f0655ee022a014ce"
                     }
                   ]
                 },
@@ -920,7 +920,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b4b690164ba7b6a27c71b5064e0bc254bc09993d26f86f0b4fc0709b1be64deb"
+                  "bytes": "fdd4463fc0248cfb6f01e34447fe4d8152d92d249975d5c203d4de7ff9c06c9e"
                 }
               ]
             },
@@ -940,7 +940,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b4b690164ba7b6a27c71b5064e0bc254bc09993d26f86f0b4fc0709b1be64deb"
+                      "bytes": "fdd4463fc0248cfb6f01e34447fe4d8152d92d249975d5c203d4de7ff9c06c9e"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_requires_applicant_auth.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_requires_applicant_auth.1.json
index 89a59c6..17d03eb 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_requires_applicant_auth.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_requires_applicant_auth.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9f9ff3d8c61c4af10cfae02ce4e1d38ebce28a016da0045a909fc49f6bad179c"
+                  "bytes": "8de413ddfe9647cc4c01823472d8b5373f4fc7ead887997e4f7edfe1fffd2873"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "472d17d5f0de7d5e7318584585692085d8b27c1960f49ea697f3c74492a91098"
+                  "bytes": "1084d56846fa27bd0456b03e8f9443f548050b1bd366adde33a411c3224671f6"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "dc8ae870d02ad7bef2a0b4ccdbf8f0c22c779373d13ede2591df43c3c5432e50"
+                  "bytes": "466b6335e063553641ebf93f50068ffdfce95bf8331b8886ef5dc9680a9849a1"
                 }
               ]
             }
@@ -418,7 +418,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f72d17d5f0de7d5e7318584585692085d8b27c1960f49ea697f3c74492a91098"
+                  "bytes": "a084d56846fa27bd0456b03e8f9443f548050b1bd366adde33a411c3224671f6"
                 }
               ]
             },
@@ -438,7 +438,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f72d17d5f0de7d5e7318584585692085d8b27c1960f49ea697f3c74492a91098"
+                      "bytes": "a084d56846fa27bd0456b03e8f9443f548050b1bd366adde33a411c3224671f6"
                     }
                   ]
                 },
@@ -828,7 +828,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "472d17d5f0de7d5e7318584585692085d8b27c1960f49ea697f3c74492a91098"
+                  "bytes": "1084d56846fa27bd0456b03e8f9443f548050b1bd366adde33a411c3224671f6"
                 }
               ]
             },
@@ -848,7 +848,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "472d17d5f0de7d5e7318584585692085d8b27c1960f49ea697f3c74492a91098"
+                      "bytes": "1084d56846fa27bd0456b03e8f9443f548050b1bd366adde33a411c3224671f6"
                     }
                   ]
                 },
@@ -873,7 +873,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9f9ff3d8c61c4af10cfae02ce4e1d38ebce28a016da0045a909fc49f6bad179c"
+                  "bytes": "466b6335e063553641ebf93f50068ffdfce95bf8331b8886ef5dc9680a9849a1"
                 }
               ]
             },
@@ -893,7 +893,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9f9ff3d8c61c4af10cfae02ce4e1d38ebce28a016da0045a909fc49f6bad179c"
+                      "bytes": "466b6335e063553641ebf93f50068ffdfce95bf8331b8886ef5dc9680a9849a1"
                     }
                   ]
                 },
@@ -918,7 +918,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dc8ae870d02ad7bef2a0b4ccdbf8f0c22c779373d13ede2591df43c3c5432e50"
+                  "bytes": "8de413ddfe9647cc4c01823472d8b5373f4fc7ead887997e4f7edfe1fffd2873"
                 }
               ]
             },
@@ -938,7 +938,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dc8ae870d02ad7bef2a0b4ccdbf8f0c22c779373d13ede2591df43c3c5432e50"
+                      "bytes": "8de413ddfe9647cc4c01823472d8b5373f4fc7ead887997e4f7edfe1fffd2873"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_when_paused_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_when_paused_reverts.1.json
index 95d7b32..e9df914 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_when_paused_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_when_paused_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9b2e0af7597753d891cd2774943d53966bb17e25963bcdb0aa745f540bed05a8"
+                  "bytes": "584fd347e274e820388df26ba39c1f335c84986bc9ef1467aa59842633dfe8bd"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "ae8074b43ec28c1730c0f568fa1dec91e29c20b5a6df4a23b1c211dc370edd0e"
+                  "bytes": "bb29c0f8e6c057dee0669217319776ee18143123a4c026eb4d628f14be0c58dc"
                 }
               ]
             }
@@ -409,7 +409,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1e8074b43ec28c1730c0f568fa1dec91e29c20b5a6df4a23b1c211dc370edd0e"
+                  "bytes": "0b29c0f8e6c057dee0669217319776ee18143123a4c026eb4d628f14be0c58dc"
                 }
               ]
             },
@@ -429,7 +429,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1e8074b43ec28c1730c0f568fa1dec91e29c20b5a6df4a23b1c211dc370edd0e"
+                      "bytes": "0b29c0f8e6c057dee0669217319776ee18143123a4c026eb4d628f14be0c58dc"
                     }
                   ]
                 },
@@ -999,7 +999,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9b2e0af7597753d891cd2774943d53966bb17e25963bcdb0aa745f540bed05a8"
+                  "bytes": "584fd347e274e820388df26ba39c1f335c84986bc9ef1467aa59842633dfe8bd"
                 }
               ]
             },
@@ -1019,7 +1019,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9b2e0af7597753d891cd2774943d53966bb17e25963bcdb0aa745f540bed05a8"
+                      "bytes": "584fd347e274e820388df26ba39c1f335c84986bc9ef1467aa59842633dfe8bd"
                     }
                   ]
                 },
@@ -1044,7 +1044,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ae8074b43ec28c1730c0f568fa1dec91e29c20b5a6df4a23b1c211dc370edd0e"
+                  "bytes": "bb29c0f8e6c057dee0669217319776ee18143123a4c026eb4d628f14be0c58dc"
                 }
               ]
             },
@@ -1064,7 +1064,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ae8074b43ec28c1730c0f568fa1dec91e29c20b5a6df4a23b1c211dc370edd0e"
+                      "bytes": "bb29c0f8e6c057dee0669217319776ee18143123a4c026eb4d628f14be0c58dc"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_without_apply_reverts.1.json b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_without_apply_reverts.1.json
index 92d73fa..6a7af63 100644
--- a/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_without_apply_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/bounty_pillar/withdraw_without_apply_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "a07ef799dda9f8119b823b573992c6bb85415c1b77cf3e159ca86c1467a550b8"
+                  "bytes": "ccf160bb3fa2e0855bbbb4c9284482796837809e66438772aadbe4115247e3fc"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a07ef799dda9f8119b823b573992c6bb85415c1b77cf3e159ca86c1467a550b8"
+                  "bytes": "ccf160bb3fa2e0855bbbb4c9284482796837809e66438772aadbe4115247e3fc"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a07ef799dda9f8119b823b573992c6bb85415c1b77cf3e159ca86c1467a550b8"
+                      "bytes": "ccf160bb3fa2e0855bbbb4c9284482796837809e66438772aadbe4115247e3fc"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/add_funds_on_cancelling_event_reverts.1.json b/contracts/events/test_snapshots/tests/cancel_refund/add_funds_on_cancelling_event_reverts.1.json
index 1ca9efc..00eeb1d 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/add_funds_on_cancelling_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/add_funds_on_cancelling_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "51693c7a44db7210c7c2af8bf376db5840b2f332940e65518aed4325501258ea"
+                  "bytes": "930b2effbeb1e7086916121d9ecb89795055f9bebb5dce12de1bb8c6d4d5af38"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "ec2cff298cf22017c644532f75849ab51085d60184851efcef53b18dc7ef3408"
+                  "bytes": "fb32801bd1f56df50b202d7fcd0c3cdb1109b936a6d7a9b91f42fbacf413fb04"
                 }
               ]
             }
@@ -337,7 +337,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "504746ae47bfb92175094a73d1ae083db642c29fa6b64eee4892f34274f80b1e"
+                  "bytes": "e25bedad85ce04a03d86e31cf5e42cec6a228495b5e83919264ffa3c5e96e5d3"
                 }
               ]
             }
@@ -1075,7 +1075,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "504746ae47bfb92175094a73d1ae083db642c29fa6b64eee4892f34274f80b1e"
+                  "bytes": "930b2effbeb1e7086916121d9ecb89795055f9bebb5dce12de1bb8c6d4d5af38"
                 }
               ]
             },
@@ -1095,7 +1095,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "504746ae47bfb92175094a73d1ae083db642c29fa6b64eee4892f34274f80b1e"
+                      "bytes": "930b2effbeb1e7086916121d9ecb89795055f9bebb5dce12de1bb8c6d4d5af38"
                     }
                   ]
                 },
@@ -1120,7 +1120,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "51693c7a44db7210c7c2af8bf376db5840b2f332940e65518aed4325501258ea"
+                  "bytes": "e25bedad85ce04a03d86e31cf5e42cec6a228495b5e83919264ffa3c5e96e5d3"
                 }
               ]
             },
@@ -1140,7 +1140,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "51693c7a44db7210c7c2af8bf376db5840b2f332940e65518aed4325501258ea"
+                      "bytes": "e25bedad85ce04a03d86e31cf5e42cec6a228495b5e83919264ffa3c5e96e5d3"
                     }
                   ]
                 },
@@ -1165,7 +1165,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ec2cff298cf22017c644532f75849ab51085d60184851efcef53b18dc7ef3408"
+                  "bytes": "fb32801bd1f56df50b202d7fcd0c3cdb1109b936a6d7a9b91f42fbacf413fb04"
                 }
               ]
             },
@@ -1185,7 +1185,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ec2cff298cf22017c644532f75849ab51085d60184851efcef53b18dc7ef3408"
+                      "bytes": "fb32801bd1f56df50b202d7fcd0c3cdb1109b936a6d7a9b91f42fbacf413fb04"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/cancel_prorata_splits_remaining_across_partners_no_owner_residual.1.json b/contracts/events/test_snapshots/tests/cancel_refund/cancel_prorata_splits_remaining_across_partners_no_owner_residual.1.json
index ce28f0e..26b3f78 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/cancel_prorata_splits_remaining_across_partners_no_owner_residual.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/cancel_prorata_splits_remaining_across_partners_no_owner_residual.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "1892cc3ba0a2395af8efe5957a5b58ab6b6da9525a3245fb28ba4e0cfe89ef59"
+                  "bytes": "cf9b509205eb57823112b970af9336c04535ca121d5c35fc779ed9fff21d784e"
                 }
               ]
             }
@@ -302,7 +302,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "0117a3ee82c9f4af5f0759304ff12713107ac2ba3b45961d24387a8ba7013139"
+                  "bytes": "cb2d96e64f29d30bea848a8134089757324e8e7db3ca9880ea79548e43724b13"
                 }
               ]
             }
@@ -373,7 +373,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "a4ee5ce3d51fcce606e3ba219496a848e3d4500ba305133ba5d34254624e1801"
+                  "bytes": "e538f6bca12eb37697e12029e43b4838bb489dd93662edc2aa5fe01ae85ec3a9"
                 }
               ]
             }
@@ -448,7 +448,38 @@
                   ]
                 },
                 {
-                  "bytes": "a814ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                  "bytes": "fa21de2bf765dbe519a13aa43bc74c2b891b479b1d92a502ac95f4c94dd57c64"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 0
+                },
+                {
+                  "bytes": "f8c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                 }
               ]
             }
@@ -474,7 +505,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "bc2f6e5100110c7da0d45c8de14d79eea0eccd0919a54dd03bf89392a2f6c8a4"
+                  "bytes": "81089cc5801c2cde5f8e708a9c5782f019c926ed1cee8ca12066de9f969620d1"
                 }
               ]
             }
@@ -500,7 +531,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "d29cb723eefdea316170f4afb3f26358767682798008058a3783d089e009c9d6"
+                  "bytes": "bf68a06a3e75affb3c5d0a9c64be0de63aca7214c7724a3167203adfbf17a49e"
                 }
               ]
             }
@@ -522,7 +553,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "4afaac1124c663650399fecb3549cfd072dbad5caef259fc2404a47281a1e2a5"
+                  "bytes": "44f57579738708b9ac4c139457208a1edd6473385a9afcd0570da8be35a18048"
                 }
               ]
             }
@@ -701,7 +732,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1814ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                  "bytes": "19c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                 }
               ]
             },
@@ -721,7 +752,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1814ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                      "bytes": "19c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                     }
                   ]
                 },
@@ -746,7 +777,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4914ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                  "bytes": "29c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                 }
               ]
             },
@@ -766,7 +797,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4914ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                      "bytes": "29c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                     }
                   ]
                 },
@@ -791,7 +822,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7914ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                  "bytes": "48c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                 }
               ]
             },
@@ -811,7 +842,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7914ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                      "bytes": "48c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                     }
                   ]
                 },
@@ -1591,6 +1622,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "12000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1676,7 +1795,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1695,7 +1814,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0117a3ee82c9f4af5f0759304ff12713107ac2ba3b45961d24387a8ba7013139"
+                  "bytes": "44f57579738708b9ac4c139457208a1edd6473385a9afcd0570da8be35a18048"
                 }
               ]
             },
@@ -1715,7 +1834,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0117a3ee82c9f4af5f0759304ff12713107ac2ba3b45961d24387a8ba7013139"
+                      "bytes": "44f57579738708b9ac4c139457208a1edd6473385a9afcd0570da8be35a18048"
                     }
                   ]
                 },
@@ -1740,7 +1859,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1892cc3ba0a2395af8efe5957a5b58ab6b6da9525a3245fb28ba4e0cfe89ef59"
+                  "bytes": "81089cc5801c2cde5f8e708a9c5782f019c926ed1cee8ca12066de9f969620d1"
                 }
               ]
             },
@@ -1760,7 +1879,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1892cc3ba0a2395af8efe5957a5b58ab6b6da9525a3245fb28ba4e0cfe89ef59"
+                      "bytes": "81089cc5801c2cde5f8e708a9c5782f019c926ed1cee8ca12066de9f969620d1"
                     }
                   ]
                 },
@@ -1785,7 +1904,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4afaac1124c663650399fecb3549cfd072dbad5caef259fc2404a47281a1e2a5"
+                  "bytes": "bf68a06a3e75affb3c5d0a9c64be0de63aca7214c7724a3167203adfbf17a49e"
                 }
               ]
             },
@@ -1805,7 +1924,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4afaac1124c663650399fecb3549cfd072dbad5caef259fc2404a47281a1e2a5"
+                      "bytes": "bf68a06a3e75affb3c5d0a9c64be0de63aca7214c7724a3167203adfbf17a49e"
                     }
                   ]
                 },
@@ -1830,7 +1949,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a4ee5ce3d51fcce606e3ba219496a848e3d4500ba305133ba5d34254624e1801"
+                  "bytes": "cb2d96e64f29d30bea848a8134089757324e8e7db3ca9880ea79548e43724b13"
                 }
               ]
             },
@@ -1850,7 +1969,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a4ee5ce3d51fcce606e3ba219496a848e3d4500ba305133ba5d34254624e1801"
+                      "bytes": "cb2d96e64f29d30bea848a8134089757324e8e7db3ca9880ea79548e43724b13"
                     }
                   ]
                 },
@@ -1875,7 +1994,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a814ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                  "bytes": "cf9b509205eb57823112b970af9336c04535ca121d5c35fc779ed9fff21d784e"
                 }
               ]
             },
@@ -1895,7 +2014,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a814ce12ba4096548c4f17d386c471aa562fb061c7917ac557022313f80b8ba0"
+                      "bytes": "cf9b509205eb57823112b970af9336c04535ca121d5c35fc779ed9fff21d784e"
                     }
                   ]
                 },
@@ -1920,7 +2039,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bc2f6e5100110c7da0d45c8de14d79eea0eccd0919a54dd03bf89392a2f6c8a4"
+                  "bytes": "e538f6bca12eb37697e12029e43b4838bb489dd93662edc2aa5fe01ae85ec3a9"
                 }
               ]
             },
@@ -1940,7 +2059,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bc2f6e5100110c7da0d45c8de14d79eea0eccd0919a54dd03bf89392a2f6c8a4"
+                      "bytes": "e538f6bca12eb37697e12029e43b4838bb489dd93662edc2aa5fe01ae85ec3a9"
                     }
                   ]
                 },
@@ -1965,7 +2084,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d29cb723eefdea316170f4afb3f26358767682798008058a3783d089e009c9d6"
+                  "bytes": "f8c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                 }
               ]
             },
@@ -1985,7 +2104,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d29cb723eefdea316170f4afb3f26358767682798008058a3783d089e009c9d6"
+                      "bytes": "f8c4185f2028390a1466a1fe79554f7104ca06412ec0837315195dfd70dded17"
                     }
                   ]
                 },
@@ -2000,6 +2119,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "fa21de2bf765dbe519a13aa43bc74c2b891b479b1d92a502ac95f4c94dd57c64"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "fa21de2bf765dbe519a13aa43bc74c2b891b479b1d92a502ac95f4c94dd57c64"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -2390,7 +2611,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "3126073502131104533"
+                "nonce": "4270020994084947596"
               }
             },
             "durability": "temporary"
@@ -2405,7 +2626,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "3126073502131104533"
+                    "nonce": "4270020994084947596"
                   }
                 },
                 "durability": "temporary",
@@ -2423,7 +2644,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "4270020994084947596"
+                "nonce": "6517132746326325848"
               }
             },
             "durability": "temporary"
@@ -2438,7 +2659,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "4270020994084947596"
+                    "nonce": "6517132746326325848"
                   }
                 },
                 "durability": "temporary",
@@ -2456,7 +2677,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "6517132746326325848"
+                "nonce": "7270604957039011794"
               }
             },
             "durability": "temporary"
@@ -2471,7 +2692,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "6517132746326325848"
+                    "nonce": "7270604957039011794"
                   }
                 },
                 "durability": "temporary",
@@ -2549,6 +2770,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "3126073502131104533"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "3126073502131104533"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/contributor_amount_zeroed_after_cancel.1.json b/contracts/events/test_snapshots/tests/cancel_refund/contributor_amount_zeroed_after_cancel.1.json
index cb22dce..3cbb2be 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/contributor_amount_zeroed_after_cancel.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/contributor_amount_zeroed_after_cancel.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "a588348b136627357abafd269fc7864c3e8f4a2a5219893ea1acb4aeb7ed1342"
+                  "bytes": "2645750cb877d2b8de20bca70acd316f7b77536124b3095adae167b556838aee"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "2500000000"
                 },
                 {
-                  "bytes": "9e2f643c7f09be66307207d38071d4d9ed6af1852a2e6133180a06d973755b88"
+                  "bytes": "88a4a46c9ed18e198e8e3d65dcd4ec521fb37723ade3e6d51a2a5cf0fb890bd8"
                 }
               ]
             }
@@ -337,7 +337,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "b3becfcfd17ea3c4decdf1eb823208ecded143848ef37c510d13a26e0d0b154b"
+                  "bytes": "7e8a0bc3a34abf5778ad8bbaec2c38d0f16aaf7acefcfc9a4a165b4cf13d362a"
                 }
               ]
             }
@@ -363,7 +363,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "44a98b6b3384ca69353476492634b86ce4dde0ed9592d57efe1e6b0c4aaa59bd"
+                  "bytes": "5e49b449073fc7c8ef8238d6abcace89f658f870173eab036005bae3fbfd71dc"
                 }
               ]
             }
@@ -385,7 +385,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "9f918cd0c4d4b8ad1511415e86133d2f10d44d92be682d6f470ca5788bff9d24"
+                  "bytes": "4fd93556ed5cbd38a8bab6a76344afdf1240182a20e81ad51c9f68b8965867cb"
                 }
               ]
             }
@@ -1011,7 +1011,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "44a98b6b3384ca69353476492634b86ce4dde0ed9592d57efe1e6b0c4aaa59bd"
+                  "bytes": "2645750cb877d2b8de20bca70acd316f7b77536124b3095adae167b556838aee"
                 }
               ]
             },
@@ -1031,7 +1031,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "44a98b6b3384ca69353476492634b86ce4dde0ed9592d57efe1e6b0c4aaa59bd"
+                      "bytes": "2645750cb877d2b8de20bca70acd316f7b77536124b3095adae167b556838aee"
                     }
                   ]
                 },
@@ -1056,7 +1056,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9e2f643c7f09be66307207d38071d4d9ed6af1852a2e6133180a06d973755b88"
+                  "bytes": "4fd93556ed5cbd38a8bab6a76344afdf1240182a20e81ad51c9f68b8965867cb"
                 }
               ]
             },
@@ -1076,7 +1076,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9e2f643c7f09be66307207d38071d4d9ed6af1852a2e6133180a06d973755b88"
+                      "bytes": "4fd93556ed5cbd38a8bab6a76344afdf1240182a20e81ad51c9f68b8965867cb"
                     }
                   ]
                 },
@@ -1101,7 +1101,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9f918cd0c4d4b8ad1511415e86133d2f10d44d92be682d6f470ca5788bff9d24"
+                  "bytes": "5e49b449073fc7c8ef8238d6abcace89f658f870173eab036005bae3fbfd71dc"
                 }
               ]
             },
@@ -1121,7 +1121,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9f918cd0c4d4b8ad1511415e86133d2f10d44d92be682d6f470ca5788bff9d24"
+                      "bytes": "5e49b449073fc7c8ef8238d6abcace89f658f870173eab036005bae3fbfd71dc"
                     }
                   ]
                 },
@@ -1146,7 +1146,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a588348b136627357abafd269fc7864c3e8f4a2a5219893ea1acb4aeb7ed1342"
+                  "bytes": "7e8a0bc3a34abf5778ad8bbaec2c38d0f16aaf7acefcfc9a4a165b4cf13d362a"
                 }
               ]
             },
@@ -1166,7 +1166,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a588348b136627357abafd269fc7864c3e8f4a2a5219893ea1acb4aeb7ed1342"
+                      "bytes": "7e8a0bc3a34abf5778ad8bbaec2c38d0f16aaf7acefcfc9a4a165b4cf13d362a"
                     }
                   ]
                 },
@@ -1191,7 +1191,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b3becfcfd17ea3c4decdf1eb823208ecded143848ef37c510d13a26e0d0b154b"
+                  "bytes": "88a4a46c9ed18e198e8e3d65dcd4ec521fb37723ade3e6d51a2a5cf0fb890bd8"
                 }
               ]
             },
@@ -1211,7 +1211,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b3becfcfd17ea3c4decdf1eb823208ecded143848ef37c510d13a26e0d0b154b"
+                      "bytes": "88a4a46c9ed18e198e8e3d65dcd4ec521fb37723ade3e6d51a2a5cf0fb890bd8"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/finalize_cancel_before_all_batches_reverts.1.json b/contracts/events/test_snapshots/tests/cancel_refund/finalize_cancel_before_all_batches_reverts.1.json
index cce1b02..c4e8ad0 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/finalize_cancel_before_all_batches_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/finalize_cancel_before_all_batches_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "48ec7d34906b2e5303d5497ab93725837dd94c3310d4afb490ad36e3b48ccd51"
+                  "bytes": "4342bfcc7fab5571b36c7190058dd086be875ce1c6036323720699699176ddd9"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "3797171bcaac120452fddaad1a021bbdaeda8bf7303df608235c2233cfc59f60"
+                  "bytes": "58855f55b45b34e00c4b0a5b5c32f1e72fb6aa807e95fe0916e394b0f0960e8f"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "7eb8b0e272b0f5cd961776f724cd4e3c2785bf0cc1f1bbb3384f3b11e990424d"
+                  "bytes": "942a3ca193ca8dd644cadc38d062ea9daa265a5d8f29c25ebf59c64ddbff7753"
                 }
               ]
             }
@@ -436,7 +436,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "3371b4a64265d2136471cdc3b4bcf22d6757c54a577f3ae1f15e5b3882d447bb"
+                  "bytes": "1df77f9eb57cdb80000949cf1cb4346a217e2381cd5915b045b20e414e071887"
                 }
               ]
             }
@@ -479,7 +479,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "085f8f87a29df9711f8b17985a8cb1f2752f05fbc410ca219d8f39811193b690"
+                  "bytes": "047b4eff84414968ebedfed621c6bd50f4145ecdad2f98a43358e670026a8c45"
                 }
               ]
             }
@@ -1501,7 +1501,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "085f8f87a29df9711f8b17985a8cb1f2752f05fbc410ca219d8f39811193b690"
+                  "bytes": "047b4eff84414968ebedfed621c6bd50f4145ecdad2f98a43358e670026a8c45"
                 }
               ]
             },
@@ -1521,7 +1521,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "085f8f87a29df9711f8b17985a8cb1f2752f05fbc410ca219d8f39811193b690"
+                      "bytes": "047b4eff84414968ebedfed621c6bd50f4145ecdad2f98a43358e670026a8c45"
                     }
                   ]
                 },
@@ -1546,7 +1546,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3371b4a64265d2136471cdc3b4bcf22d6757c54a577f3ae1f15e5b3882d447bb"
+                  "bytes": "1df77f9eb57cdb80000949cf1cb4346a217e2381cd5915b045b20e414e071887"
                 }
               ]
             },
@@ -1566,7 +1566,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3371b4a64265d2136471cdc3b4bcf22d6757c54a577f3ae1f15e5b3882d447bb"
+                      "bytes": "1df77f9eb57cdb80000949cf1cb4346a217e2381cd5915b045b20e414e071887"
                     }
                   ]
                 },
@@ -1591,7 +1591,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3797171bcaac120452fddaad1a021bbdaeda8bf7303df608235c2233cfc59f60"
+                  "bytes": "4342bfcc7fab5571b36c7190058dd086be875ce1c6036323720699699176ddd9"
                 }
               ]
             },
@@ -1611,7 +1611,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3797171bcaac120452fddaad1a021bbdaeda8bf7303df608235c2233cfc59f60"
+                      "bytes": "4342bfcc7fab5571b36c7190058dd086be875ce1c6036323720699699176ddd9"
                     }
                   ]
                 },
@@ -1636,7 +1636,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "48ec7d34906b2e5303d5497ab93725837dd94c3310d4afb490ad36e3b48ccd51"
+                  "bytes": "58855f55b45b34e00c4b0a5b5c32f1e72fb6aa807e95fe0916e394b0f0960e8f"
                 }
               ]
             },
@@ -1656,7 +1656,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "48ec7d34906b2e5303d5497ab93725837dd94c3310d4afb490ad36e3b48ccd51"
+                      "bytes": "58855f55b45b34e00c4b0a5b5c32f1e72fb6aa807e95fe0916e394b0f0960e8f"
                     }
                   ]
                 },
@@ -1681,7 +1681,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7eb8b0e272b0f5cd961776f724cd4e3c2785bf0cc1f1bbb3384f3b11e990424d"
+                  "bytes": "942a3ca193ca8dd644cadc38d062ea9daa265a5d8f29c25ebf59c64ddbff7753"
                 }
               ]
             },
@@ -1701,7 +1701,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7eb8b0e272b0f5cd961776f724cd4e3c2785bf0cc1f1bbb3384f3b11e990424d"
+                      "bytes": "942a3ca193ca8dd644cadc38d062ea9daa265a5d8f29c25ebf59c64ddbff7753"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/full_partner_then_residual_pays_partners_and_owner.1.json b/contracts/events/test_snapshots/tests/cancel_refund/full_partner_then_residual_pays_partners_and_owner.1.json
index 1d28df0..81984fe 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/full_partner_then_residual_pays_partners_and_owner.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/full_partner_then_residual_pays_partners_and_owner.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "54cd5d2049bfba0f1d9412bff8bffaff0171a5b9daccbb51028dd466bbf0938e"
+                  "bytes": "1c085925bc08d2d65f55b8816fbf660125287a0705171d9ed9696dabf6f66e68"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "692a1e2d27d60382cf1a7dfc9cd7d1af295848032a0146b1f3396a36231d1e38"
+                  "bytes": "2c9972455ee734034dcfedcb15975f07aa0777e0efa1b01ff51561282bd7ea79"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "3000000000"
                 },
                 {
-                  "bytes": "d1495f0b839a8c865217ef619ca3cbfe2b0e9c27838b2af4dd304f0d6f8468fa"
+                  "bytes": "e00de273e578f7b4dc359baac436f5682b14ab75231ad7f5acff1f3be5da2229"
                 }
               ]
             }
@@ -412,7 +412,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "6f9c907c2ca04a987d3218b20d9b6f2e60c4ac5370372f9f27a2a4d3ff6da6e4"
+                  "bytes": "325a4310189538670e6182cdb9f5fc109f3a321228e03f58f68d71d460f1d39a"
                 }
               ]
             }
@@ -438,7 +438,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "4a215bd32f766698ef07ddd9869c1a1729bf7c3d42f4ef334dedf639aa0db1c8"
+                  "bytes": "2a5f459358089eb80b64ddc629d82e0819488f9dcc72adfbfc0df0e110388703"
                 }
               ]
             }
@@ -460,7 +460,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "e4e821c326d3a2af4e0eb8bfcee0237fc471cf7cd8c16d885e8a5cbc0772fa14"
+                  "bytes": "85916216699736cef08806500582209c3ec5d4813e143958d9dc06b60ba32816"
                 }
               ]
             }
@@ -1243,7 +1243,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4a215bd32f766698ef07ddd9869c1a1729bf7c3d42f4ef334dedf639aa0db1c8"
+                  "bytes": "1c085925bc08d2d65f55b8816fbf660125287a0705171d9ed9696dabf6f66e68"
                 }
               ]
             },
@@ -1263,7 +1263,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4a215bd32f766698ef07ddd9869c1a1729bf7c3d42f4ef334dedf639aa0db1c8"
+                      "bytes": "1c085925bc08d2d65f55b8816fbf660125287a0705171d9ed9696dabf6f66e68"
                     }
                   ]
                 },
@@ -1288,7 +1288,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "54cd5d2049bfba0f1d9412bff8bffaff0171a5b9daccbb51028dd466bbf0938e"
+                  "bytes": "2a5f459358089eb80b64ddc629d82e0819488f9dcc72adfbfc0df0e110388703"
                 }
               ]
             },
@@ -1308,7 +1308,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "54cd5d2049bfba0f1d9412bff8bffaff0171a5b9daccbb51028dd466bbf0938e"
+                      "bytes": "2a5f459358089eb80b64ddc629d82e0819488f9dcc72adfbfc0df0e110388703"
                     }
                   ]
                 },
@@ -1333,7 +1333,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "692a1e2d27d60382cf1a7dfc9cd7d1af295848032a0146b1f3396a36231d1e38"
+                  "bytes": "2c9972455ee734034dcfedcb15975f07aa0777e0efa1b01ff51561282bd7ea79"
                 }
               ]
             },
@@ -1353,7 +1353,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "692a1e2d27d60382cf1a7dfc9cd7d1af295848032a0146b1f3396a36231d1e38"
+                      "bytes": "2c9972455ee734034dcfedcb15975f07aa0777e0efa1b01ff51561282bd7ea79"
                     }
                   ]
                 },
@@ -1378,7 +1378,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6f9c907c2ca04a987d3218b20d9b6f2e60c4ac5370372f9f27a2a4d3ff6da6e4"
+                  "bytes": "325a4310189538670e6182cdb9f5fc109f3a321228e03f58f68d71d460f1d39a"
                 }
               ]
             },
@@ -1398,7 +1398,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6f9c907c2ca04a987d3218b20d9b6f2e60c4ac5370372f9f27a2a4d3ff6da6e4"
+                      "bytes": "325a4310189538670e6182cdb9f5fc109f3a321228e03f58f68d71d460f1d39a"
                     }
                   ]
                 },
@@ -1423,7 +1423,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d1495f0b839a8c865217ef619ca3cbfe2b0e9c27838b2af4dd304f0d6f8468fa"
+                  "bytes": "85916216699736cef08806500582209c3ec5d4813e143958d9dc06b60ba32816"
                 }
               ]
             },
@@ -1443,7 +1443,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d1495f0b839a8c865217ef619ca3cbfe2b0e9c27838b2af4dd304f0d6f8468fa"
+                      "bytes": "85916216699736cef08806500582209c3ec5d4813e143958d9dc06b60ba32816"
                     }
                   ]
                 },
@@ -1468,7 +1468,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e4e821c326d3a2af4e0eb8bfcee0237fc471cf7cd8c16d885e8a5cbc0772fa14"
+                  "bytes": "e00de273e578f7b4dc359baac436f5682b14ab75231ad7f5acff1f3be5da2229"
                 }
               ]
             },
@@ -1488,7 +1488,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e4e821c326d3a2af4e0eb8bfcee0237fc471cf7cd8c16d885e8a5cbc0772fa14"
+                      "bytes": "e00de273e578f7b4dc359baac436f5682b14ab75231ad7f5acff1f3be5da2229"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/owner_only_cancel_settles_inline.1.json b/contracts/events/test_snapshots/tests/cancel_refund/owner_only_cancel_settles_inline.1.json
index 353e85a..613d943 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/owner_only_cancel_settles_inline.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/owner_only_cancel_settles_inline.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "df8a56f9e4f962b3ef48fd0062fcb81481c62b47d391cbb883952bc153e0b298"
+                  "bytes": "2dce6af448ba377886fb5026dfaa450058d52be0195f9f08e649974b1cb0ec3c"
                 }
               ]
             }
@@ -267,7 +267,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "ff121e0da67b95c9049ee0b0722976c4ff5f4025805de329a581b02094e7dc4b"
+                  "bytes": "5cb1ac5ee0db4c247eca11bf679caf362f3c1e5befd3fed2bb921b7eddbafe48"
                 }
               ]
             }
@@ -696,7 +696,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "df8a56f9e4f962b3ef48fd0062fcb81481c62b47d391cbb883952bc153e0b298"
+                  "bytes": "2dce6af448ba377886fb5026dfaa450058d52be0195f9f08e649974b1cb0ec3c"
                 }
               ]
             },
@@ -716,7 +716,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "df8a56f9e4f962b3ef48fd0062fcb81481c62b47d391cbb883952bc153e0b298"
+                      "bytes": "2dce6af448ba377886fb5026dfaa450058d52be0195f9f08e649974b1cb0ec3c"
                     }
                   ]
                 },
@@ -741,7 +741,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ff121e0da67b95c9049ee0b0722976c4ff5f4025805de329a581b02094e7dc4b"
+                  "bytes": "5cb1ac5ee0db4c247eca11bf679caf362f3c1e5befd3fed2bb921b7eddbafe48"
                 }
               ]
             },
@@ -761,7 +761,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ff121e0da67b95c9049ee0b0722976c4ff5f4025805de329a581b02094e7dc4b"
+                      "bytes": "5cb1ac5ee0db4c247eca11bf679caf362f3c1e5befd3fed2bb921b7eddbafe48"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/owner_only_process_and_finalize_rejected_after_inline_settle.1.json b/contracts/events/test_snapshots/tests/cancel_refund/owner_only_process_and_finalize_rejected_after_inline_settle.1.json
index d632bc3..4247eb9 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/owner_only_process_and_finalize_rejected_after_inline_settle.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/owner_only_process_and_finalize_rejected_after_inline_settle.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9a44621d77e1af6b8e16a0444af78c084db99ba956703434bdd7710d1237d365"
+                  "bytes": "d65dfd905c47a970683924807c1d2f79cec4440c66454660c11d1db5af86a0ee"
                 }
               ]
             }
@@ -266,7 +266,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "f2f3fbeaecf4c30f2ef243af8310469d228d4cb72e56cc0da0317095fc371d2f"
+                  "bytes": "dd51a32acccbafe9cc236ae691fe2cfab1fec6d3ca32e28ce627744d0e91529b"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9a44621d77e1af6b8e16a0444af78c084db99ba956703434bdd7710d1237d365"
+                  "bytes": "d65dfd905c47a970683924807c1d2f79cec4440c66454660c11d1db5af86a0ee"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9a44621d77e1af6b8e16a0444af78c084db99ba956703434bdd7710d1237d365"
+                      "bytes": "d65dfd905c47a970683924807c1d2f79cec4440c66454660c11d1db5af86a0ee"
                     }
                   ]
                 },
@@ -740,7 +740,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f2f3fbeaecf4c30f2ef243af8310469d228d4cb72e56cc0da0317095fc371d2f"
+                  "bytes": "dd51a32acccbafe9cc236ae691fe2cfab1fec6d3ca32e28ce627744d0e91529b"
                 }
               ]
             },
@@ -760,7 +760,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f2f3fbeaecf4c30f2ef243af8310469d228d4cb72e56cc0da0317095fc371d2f"
+                      "bytes": "dd51a32acccbafe9cc236ae691fe2cfab1fec6d3ca32e28ce627744d0e91529b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/paged_cancel_processes_in_batches.1.json b/contracts/events/test_snapshots/tests/cancel_refund/paged_cancel_processes_in_batches.1.json
index af498fa..eeccef9 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/paged_cancel_processes_in_batches.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/paged_cancel_processes_in_batches.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "5ed40e3f646b53018d01fb0003874516c5c9f01da39535ab8bcd2c04d27dd75d"
+                  "bytes": "b0417a26267f2e66f26ed4a815830576324bd67fa6a48c24ce7b88c24c563983"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "94cf2c4ba1e8287086f57cd4ac034abbba4d1750a85055f63a0ab8b954001533"
+                  "bytes": "b5267e73a4b110e416eb4646245a1c9ba6f672bd7295aaba8346b80832f7c795"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "2b91c61b3963f4201ca7d7a0f5c5e7dbb1416b9e5fbfde70f9d85d4fe471a8ef"
+                  "bytes": "dc9a7208203ef360cf917642f0fca34b5da48bad9652c67fbc61828749f42cbd"
                 }
               ]
             }
@@ -436,7 +436,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "7a118ff7a81eaa888e4477a0d29683c6502cc2a231ddf8b8d69826f0ed037e0f"
+                  "bytes": "15120ad52343532c22b0624111e6efc19caa45988553a725b79e2bb04c5b9815"
                 }
               ]
             }
@@ -507,7 +507,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "9082f518b8876a015c27480de0ab96692b869e41422a1c5b335710e41f5f0925"
+                  "bytes": "23b8c3ffe61395ff24488d5f778b978084eecfffc6a464cb4bf8c373f7fd1424"
                 }
               ]
             }
@@ -578,7 +578,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "8fada703d8adab769c774f9c12fda9ce97536b3cfaf9189fa9255afedcb2ea53"
+                  "bytes": "feb2c8c8a6a1e7bbbbc54675b8305d9788418aab069f5282a9c38430cb7f0b09"
                 }
               ]
             }
@@ -628,7 +628,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "1d0e004e09cd9e010d762244bf73a641c21ac53515815eb1b0ac6f6378dcf618"
+                  "bytes": "f7dc7c2c2bc255a0529dd9791bc5281beadfdfe8d7bab776ec0de4bab876e448"
                 }
               ]
             }
@@ -654,7 +654,7 @@
                   "u32": 2
                 },
                 {
-                  "bytes": "8586ad05f9dffae9a634eb6c0eee2a12cacdc4f7a190e9d618fa8c029789dfa3"
+                  "bytes": "fef23ca78a01c3d6581d5a22dcdb77f6eb3bbe310b485e251e37bd0edd83e3cf"
                 }
               ]
             }
@@ -679,7 +679,7 @@
                   "u32": 2
                 },
                 {
-                  "bytes": "8b20e33d5d41b75aeb7bf41098c1667cfabd5f81e05d05f0120dd6f86dcb7e0f"
+                  "bytes": "0fbdf25dbbf1620cfd70d73f0002e76949b64f518248820fb50494ea4b916e62"
                 }
               ]
             }
@@ -705,7 +705,7 @@
                   "u32": 2
                 },
                 {
-                  "bytes": "6cff65bbc950f7992364e3a7fa4ec73f3b4b549a835edbaa3ebbc3875859d973"
+                  "bytes": "55dbb035047558c7e50f5cc45bd8e9bac7775961dfaf99b2f14758deb0d81205"
                 }
               ]
             }
@@ -727,7 +727,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "a828a1d46dd1e0622aeba874a6bfbe5c88b1bae969bd851f18243b9522da55d1"
+                  "bytes": "22b2c42b38624b136cc8e780c57c164cc3074bddb8b2317daecc3d692b8abc2b"
                 }
               ]
             }
@@ -1972,7 +1972,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1d0e004e09cd9e010d762244bf73a641c21ac53515815eb1b0ac6f6378dcf618"
+                  "bytes": "0fbdf25dbbf1620cfd70d73f0002e76949b64f518248820fb50494ea4b916e62"
                 }
               ]
             },
@@ -1992,7 +1992,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1d0e004e09cd9e010d762244bf73a641c21ac53515815eb1b0ac6f6378dcf618"
+                      "bytes": "0fbdf25dbbf1620cfd70d73f0002e76949b64f518248820fb50494ea4b916e62"
                     }
                   ]
                 },
@@ -2017,7 +2017,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2b91c61b3963f4201ca7d7a0f5c5e7dbb1416b9e5fbfde70f9d85d4fe471a8ef"
+                  "bytes": "15120ad52343532c22b0624111e6efc19caa45988553a725b79e2bb04c5b9815"
                 }
               ]
             },
@@ -2037,7 +2037,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2b91c61b3963f4201ca7d7a0f5c5e7dbb1416b9e5fbfde70f9d85d4fe471a8ef"
+                      "bytes": "15120ad52343532c22b0624111e6efc19caa45988553a725b79e2bb04c5b9815"
                     }
                   ]
                 },
@@ -2062,7 +2062,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5ed40e3f646b53018d01fb0003874516c5c9f01da39535ab8bcd2c04d27dd75d"
+                  "bytes": "22b2c42b38624b136cc8e780c57c164cc3074bddb8b2317daecc3d692b8abc2b"
                 }
               ]
             },
@@ -2082,7 +2082,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5ed40e3f646b53018d01fb0003874516c5c9f01da39535ab8bcd2c04d27dd75d"
+                      "bytes": "22b2c42b38624b136cc8e780c57c164cc3074bddb8b2317daecc3d692b8abc2b"
                     }
                   ]
                 },
@@ -2107,7 +2107,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6cff65bbc950f7992364e3a7fa4ec73f3b4b549a835edbaa3ebbc3875859d973"
+                  "bytes": "23b8c3ffe61395ff24488d5f778b978084eecfffc6a464cb4bf8c373f7fd1424"
                 }
               ]
             },
@@ -2127,7 +2127,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6cff65bbc950f7992364e3a7fa4ec73f3b4b549a835edbaa3ebbc3875859d973"
+                      "bytes": "23b8c3ffe61395ff24488d5f778b978084eecfffc6a464cb4bf8c373f7fd1424"
                     }
                   ]
                 },
@@ -2152,7 +2152,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7a118ff7a81eaa888e4477a0d29683c6502cc2a231ddf8b8d69826f0ed037e0f"
+                  "bytes": "55dbb035047558c7e50f5cc45bd8e9bac7775961dfaf99b2f14758deb0d81205"
                 }
               ]
             },
@@ -2172,7 +2172,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7a118ff7a81eaa888e4477a0d29683c6502cc2a231ddf8b8d69826f0ed037e0f"
+                      "bytes": "55dbb035047558c7e50f5cc45bd8e9bac7775961dfaf99b2f14758deb0d81205"
                     }
                   ]
                 },
@@ -2197,7 +2197,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8586ad05f9dffae9a634eb6c0eee2a12cacdc4f7a190e9d618fa8c029789dfa3"
+                  "bytes": "b0417a26267f2e66f26ed4a815830576324bd67fa6a48c24ce7b88c24c563983"
                 }
               ]
             },
@@ -2217,7 +2217,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8586ad05f9dffae9a634eb6c0eee2a12cacdc4f7a190e9d618fa8c029789dfa3"
+                      "bytes": "b0417a26267f2e66f26ed4a815830576324bd67fa6a48c24ce7b88c24c563983"
                     }
                   ]
                 },
@@ -2242,7 +2242,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8b20e33d5d41b75aeb7bf41098c1667cfabd5f81e05d05f0120dd6f86dcb7e0f"
+                  "bytes": "b5267e73a4b110e416eb4646245a1c9ba6f672bd7295aaba8346b80832f7c795"
                 }
               ]
             },
@@ -2262,7 +2262,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8b20e33d5d41b75aeb7bf41098c1667cfabd5f81e05d05f0120dd6f86dcb7e0f"
+                      "bytes": "b5267e73a4b110e416eb4646245a1c9ba6f672bd7295aaba8346b80832f7c795"
                     }
                   ]
                 },
@@ -2287,7 +2287,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8fada703d8adab769c774f9c12fda9ce97536b3cfaf9189fa9255afedcb2ea53"
+                  "bytes": "dc9a7208203ef360cf917642f0fca34b5da48bad9652c67fbc61828749f42cbd"
                 }
               ]
             },
@@ -2307,7 +2307,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8fada703d8adab769c774f9c12fda9ce97536b3cfaf9189fa9255afedcb2ea53"
+                      "bytes": "dc9a7208203ef360cf917642f0fca34b5da48bad9652c67fbc61828749f42cbd"
                     }
                   ]
                 },
@@ -2332,7 +2332,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9082f518b8876a015c27480de0ab96692b869e41422a1c5b335710e41f5f0925"
+                  "bytes": "f7dc7c2c2bc255a0529dd9791bc5281beadfdfe8d7bab776ec0de4bab876e448"
                 }
               ]
             },
@@ -2352,7 +2352,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9082f518b8876a015c27480de0ab96692b869e41422a1c5b335710e41f5f0925"
+                      "bytes": "f7dc7c2c2bc255a0529dd9791bc5281beadfdfe8d7bab776ec0de4bab876e448"
                     }
                   ]
                 },
@@ -2377,7 +2377,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "94cf2c4ba1e8287086f57cd4ac034abbba4d1750a85055f63a0ab8b954001533"
+                  "bytes": "feb2c8c8a6a1e7bbbbc54675b8305d9788418aab069f5282a9c38430cb7f0b09"
                 }
               ]
             },
@@ -2397,7 +2397,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "94cf2c4ba1e8287086f57cd4ac034abbba4d1750a85055f63a0ab8b954001533"
+                      "bytes": "feb2c8c8a6a1e7bbbbc54675b8305d9788418aab069f5282a9c38430cb7f0b09"
                     }
                   ]
                 },
@@ -2422,7 +2422,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a828a1d46dd1e0622aeba874a6bfbe5c88b1bae969bd851f18243b9522da55d1"
+                  "bytes": "fef23ca78a01c3d6581d5a22dcdb77f6eb3bbe310b485e251e37bd0edd83e3cf"
                 }
               ]
             },
@@ -2442,7 +2442,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a828a1d46dd1e0622aeba874a6bfbe5c88b1bae969bd851f18243b9522da55d1"
+                      "bytes": "fef23ca78a01c3d6581d5a22dcdb77f6eb3bbe310b485e251e37bd0edd83e3cf"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/process_cancel_batch_without_start_reverts.1.json b/contracts/events/test_snapshots/tests/cancel_refund/process_cancel_batch_without_start_reverts.1.json
index 8f4cd7f..f01bcfd 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/process_cancel_batch_without_start_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/process_cancel_batch_without_start_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "b23ae3d0d4f44b3c302927bea52c6260aa26858b654d0cd500aeb548e131a11d"
+                  "bytes": "8f3a847c4d5adcd9c96ac0f7cc916d2ca30d0449e59757f4694420a546db9d8d"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b23ae3d0d4f44b3c302927bea52c6260aa26858b654d0cd500aeb548e131a11d"
+                  "bytes": "8f3a847c4d5adcd9c96ac0f7cc916d2ca30d0449e59757f4694420a546db9d8d"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b23ae3d0d4f44b3c302927bea52c6260aa26858b654d0cd500aeb548e131a11d"
+                      "bytes": "8f3a847c4d5adcd9c96ac0f7cc916d2ca30d0449e59757f4694420a546db9d8d"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cancel_refund/start_cancel_on_already_cancelled_reverts.1.json b/contracts/events/test_snapshots/tests/cancel_refund/start_cancel_on_already_cancelled_reverts.1.json
index 88392cd..84975bd 100644
--- a/contracts/events/test_snapshots/tests/cancel_refund/start_cancel_on_already_cancelled_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cancel_refund/start_cancel_on_already_cancelled_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "47a0b36fbe5ec3dbb69be4c3a18c285c4ca2491b3190b620c7b89fa9810ce0a9"
+                  "bytes": "75038a5fc92e5e6f63f71ca7670fab64e5815b9bfc57c428d8ed613df4eed341"
                 }
               ]
             }
@@ -266,7 +266,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "54a120cef5af72454ee06f39e25883025a40108d3992803674fb60a3d9fe2588"
+                  "bytes": "ae632561014e94f5621ec79ffb8a8fbc78a2a643bf9b7e80596ae7e415218b86"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "47a0b36fbe5ec3dbb69be4c3a18c285c4ca2491b3190b620c7b89fa9810ce0a9"
+                  "bytes": "75038a5fc92e5e6f63f71ca7670fab64e5815b9bfc57c428d8ed613df4eed341"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "47a0b36fbe5ec3dbb69be4c3a18c285c4ca2491b3190b620c7b89fa9810ce0a9"
+                      "bytes": "75038a5fc92e5e6f63f71ca7670fab64e5815b9bfc57c428d8ed613df4eed341"
                     }
                   ]
                 },
@@ -740,7 +740,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "54a120cef5af72454ee06f39e25883025a40108d3992803674fb60a3d9fe2588"
+                  "bytes": "ae632561014e94f5621ec79ffb8a8fbc78a2a643bf9b7e80596ae7e415218b86"
                 }
               ]
             },
@@ -760,7 +760,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "54a120cef5af72454ee06f39e25883025a40108d3992803674fb60a3d9fe2588"
+                      "bytes": "ae632561014e94f5621ec79ffb8a8fbc78a2a643bf9b7e80596ae7e415218b86"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/add_funds_paged_storage_round_trip.1.json b/contracts/events/test_snapshots/tests/contributions/add_funds_paged_storage_round_trip.1.json
index f7de7bb..2d8c9b5 100644
--- a/contracts/events/test_snapshots/tests/contributions/add_funds_paged_storage_round_trip.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/add_funds_paged_storage_round_trip.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "dd5e96c256e619cf4c6df4b22d67bf537a37e92a17d7faa5d93ec4a6589b253b"
+                  "bytes": "4f49dca382187846697f0a8e78cce0d91eab6fcebd6582475e7575e0ac9e646e"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "070e398e8dba03f0d6f2b654bb078e09053ee9f16b360e5d44545bdfdd474e30"
+                  "bytes": "506d2f06ec28900ff615a76d2893f88a244ad6213106d1f191fa1f6bc93248ad"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "4c79e4bfc05aa655214ee4cbe1cf52e28977743f4936d4db991259c90ff4f768"
+                  "bytes": "086806e28cafdafc6ebc5940712e5113f0e5825da8a5c1c407698d68c57c946e"
                 }
               ]
             }
@@ -436,7 +436,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "4bc002e6819859f7b67ec283c2e974462fd81066bd3b21e8464862b8557ddb87"
+                  "bytes": "2929c7f4ab34b6e58628b9ddd3b8ea78c73284d16dc174bc546c70e7223b09ff"
                 }
               ]
             }
@@ -1393,7 +1393,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "070e398e8dba03f0d6f2b654bb078e09053ee9f16b360e5d44545bdfdd474e30"
+                  "bytes": "086806e28cafdafc6ebc5940712e5113f0e5825da8a5c1c407698d68c57c946e"
                 }
               ]
             },
@@ -1413,7 +1413,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "070e398e8dba03f0d6f2b654bb078e09053ee9f16b360e5d44545bdfdd474e30"
+                      "bytes": "086806e28cafdafc6ebc5940712e5113f0e5825da8a5c1c407698d68c57c946e"
                     }
                   ]
                 },
@@ -1438,7 +1438,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4bc002e6819859f7b67ec283c2e974462fd81066bd3b21e8464862b8557ddb87"
+                  "bytes": "2929c7f4ab34b6e58628b9ddd3b8ea78c73284d16dc174bc546c70e7223b09ff"
                 }
               ]
             },
@@ -1458,7 +1458,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4bc002e6819859f7b67ec283c2e974462fd81066bd3b21e8464862b8557ddb87"
+                      "bytes": "2929c7f4ab34b6e58628b9ddd3b8ea78c73284d16dc174bc546c70e7223b09ff"
                     }
                   ]
                 },
@@ -1483,7 +1483,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4c79e4bfc05aa655214ee4cbe1cf52e28977743f4936d4db991259c90ff4f768"
+                  "bytes": "4f49dca382187846697f0a8e78cce0d91eab6fcebd6582475e7575e0ac9e646e"
                 }
               ]
             },
@@ -1503,7 +1503,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4c79e4bfc05aa655214ee4cbe1cf52e28977743f4936d4db991259c90ff4f768"
+                      "bytes": "4f49dca382187846697f0a8e78cce0d91eab6fcebd6582475e7575e0ac9e646e"
                     }
                   ]
                 },
@@ -1528,7 +1528,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dd5e96c256e619cf4c6df4b22d67bf537a37e92a17d7faa5d93ec4a6589b253b"
+                  "bytes": "506d2f06ec28900ff615a76d2893f88a244ad6213106d1f191fa1f6bc93248ad"
                 }
               ]
             },
@@ -1548,7 +1548,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dd5e96c256e619cf4c6df4b22d67bf537a37e92a17d7faa5d93ec4a6589b253b"
+                      "bytes": "506d2f06ec28900ff615a76d2893f88a244ad6213106d1f191fa1f6bc93248ad"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/add_funds_to_cancelled_event_reverts.1.json b/contracts/events/test_snapshots/tests/contributions/add_funds_to_cancelled_event_reverts.1.json
index 54977bc..68154d0 100644
--- a/contracts/events/test_snapshots/tests/contributions/add_funds_to_cancelled_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/add_funds_to_cancelled_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "89e2a6a6be81f6edb671df66b51b8126686e7568d6b0a6d34869b2fdaac54497"
+                  "bytes": "c909b13c990a03b7e37f9cea3e8adca69ffb78b96119cee0d1bcd0d3d0e153b6"
                 }
               ]
             }
@@ -266,7 +266,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "37aa0e79f18d6544335f0bcefc20cd3f48598063c07a363c720a68acaf7171a7"
+                  "bytes": "7115492ffb6a420016abf94e168b10c0b89ff4a13e41efdad68e38e73e3c9e84"
                 }
               ]
             }
@@ -717,7 +717,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "37aa0e79f18d6544335f0bcefc20cd3f48598063c07a363c720a68acaf7171a7"
+                  "bytes": "7115492ffb6a420016abf94e168b10c0b89ff4a13e41efdad68e38e73e3c9e84"
                 }
               ]
             },
@@ -737,7 +737,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "37aa0e79f18d6544335f0bcefc20cd3f48598063c07a363c720a68acaf7171a7"
+                      "bytes": "7115492ffb6a420016abf94e168b10c0b89ff4a13e41efdad68e38e73e3c9e84"
                     }
                   ]
                 },
@@ -762,7 +762,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "89e2a6a6be81f6edb671df66b51b8126686e7568d6b0a6d34869b2fdaac54497"
+                  "bytes": "c909b13c990a03b7e37f9cea3e8adca69ffb78b96119cee0d1bcd0d3d0e153b6"
                 }
               ]
             },
@@ -782,7 +782,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "89e2a6a6be81f6edb671df66b51b8126686e7568d6b0a6d34869b2fdaac54497"
+                      "bytes": "c909b13c990a03b7e37f9cea3e8adca69ffb78b96119cee0d1bcd0d3d0e153b6"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/anyone_can_top_up_an_active_event.1.json b/contracts/events/test_snapshots/tests/contributions/anyone_can_top_up_an_active_event.1.json
index 22fee7e..8cc530f 100644
--- a/contracts/events/test_snapshots/tests/contributions/anyone_can_top_up_an_active_event.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/anyone_can_top_up_an_active_event.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "67b919021c638c954bf4790562d196d41406068985897e46209fb6d3a0ba60ef"
+                  "bytes": "f3e170582d7ca9b6158d84893dacf726f441787b6f0d61bdca406f91f0d927ac"
                 }
               ]
             }
@@ -295,7 +295,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "3fc4b27493c9fd3d6eb07f9f0a4cb19e07c761da38135bcc25081154306245d4"
+                  "bytes": "1107c935653b3728a55ce5bdccb8222f22ae9ade3d1c556a79bb03c807a2dd57"
                 }
               ]
             }
@@ -945,7 +945,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3fc4b27493c9fd3d6eb07f9f0a4cb19e07c761da38135bcc25081154306245d4"
+                  "bytes": "1107c935653b3728a55ce5bdccb8222f22ae9ade3d1c556a79bb03c807a2dd57"
                 }
               ]
             },
@@ -965,7 +965,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3fc4b27493c9fd3d6eb07f9f0a4cb19e07c761da38135bcc25081154306245d4"
+                      "bytes": "1107c935653b3728a55ce5bdccb8222f22ae9ade3d1c556a79bb03c807a2dd57"
                     }
                   ]
                 },
@@ -990,7 +990,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "67b919021c638c954bf4790562d196d41406068985897e46209fb6d3a0ba60ef"
+                  "bytes": "f3e170582d7ca9b6158d84893dacf726f441787b6f0d61bdca406f91f0d927ac"
                 }
               ]
             },
@@ -1010,7 +1010,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "67b919021c638c954bf4790562d196d41406068985897e46209fb6d3a0ba60ef"
+                      "bytes": "f3e170582d7ca9b6158d84893dacf726f441787b6f0d61bdca406f91f0d927ac"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/below_minimum_contribution_reverts.1.json b/contracts/events/test_snapshots/tests/contributions/below_minimum_contribution_reverts.1.json
index a2ec08b..61eabd3 100644
--- a/contracts/events/test_snapshots/tests/contributions/below_minimum_contribution_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/below_minimum_contribution_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "a5404596a0f946e48f86145b40597075de524984269d731ffa2fb14ebdef197c"
+                  "bytes": "dc30f5a9c7e0bcd432d997ffe26339603ecaf74ce4e3b17fbdd5153032092170"
                 }
               ]
             }
@@ -295,7 +295,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "ced6d9cace05b6470645e3a9ffec9d4b0e38380c47f2f40652e299dfc56f0d44"
+                  "bytes": "d3bd6f6f391bb22599c8acbd1cc4395fd39b7f7631a43b13f67d228992d10a56"
                 }
               ]
             }
@@ -941,7 +941,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a5404596a0f946e48f86145b40597075de524984269d731ffa2fb14ebdef197c"
+                  "bytes": "d3bd6f6f391bb22599c8acbd1cc4395fd39b7f7631a43b13f67d228992d10a56"
                 }
               ]
             },
@@ -961,7 +961,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a5404596a0f946e48f86145b40597075de524984269d731ffa2fb14ebdef197c"
+                      "bytes": "d3bd6f6f391bb22599c8acbd1cc4395fd39b7f7631a43b13f67d228992d10a56"
                     }
                   ]
                 },
@@ -986,7 +986,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ced6d9cace05b6470645e3a9ffec9d4b0e38380c47f2f40652e299dfc56f0d44"
+                  "bytes": "dc30f5a9c7e0bcd432d997ffe26339603ecaf74ce4e3b17fbdd5153032092170"
                 }
               ]
             },
@@ -1006,7 +1006,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ced6d9cace05b6470645e3a9ffec9d4b0e38380c47f2f40652e299dfc56f0d44"
+                      "bytes": "dc30f5a9c7e0bcd432d997ffe26339603ecaf74ce4e3b17fbdd5153032092170"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/cancel_at_boundary_pays_partners_full_no_owner_residual.1.json b/contracts/events/test_snapshots/tests/contributions/cancel_at_boundary_pays_partners_full_no_owner_residual.1.json
index 651fe53..58f6e95 100644
--- a/contracts/events/test_snapshots/tests/contributions/cancel_at_boundary_pays_partners_full_no_owner_residual.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/cancel_at_boundary_pays_partners_full_no_owner_residual.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "10b2715acce0961d9894db9cb4a163369b92c6626bceea18a69f07ab45626cc4"
+                  "bytes": "a726bb825d1902f2b492e770a71a84ba2e4ee7f8951dfade66316bd766feea7b"
                 }
               ]
             }
@@ -324,7 +324,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "b8b2ab78ed3fafaa376de8136ee4b170da955533b06bab2681ea6460bf8c47c6"
+                  "bytes": "1176ac4d14a8985d2f763ea4e2dc0ddae56846dfe9eb13ee39b8d8bf756d9fca"
                 }
               ]
             }
@@ -373,7 +373,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "576a1dbd48c98b7d2dd6c377aa31feb9f83704b9bf71ae65db443253b14e937d"
+                  "bytes": "bec70b84f800d22864fdd9fe9f8c68dff270246685eccbf081658e1c5d7a9e04"
                 }
               ]
             }
@@ -448,7 +448,38 @@
                   ]
                 },
                 {
-                  "bytes": "f68347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                  "bytes": "e279d3e600a3e84f04d2e3ea5acb4b20fc31b9d186610c4e2e6889d791d8eaba"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "76c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                 }
               ]
             }
@@ -474,7 +505,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "b95c7577122d4e604293d7d27935d9ac7dbdd757b259c34bc868f1568d763edf"
+                  "bytes": "7f737f66e12c2066913a8d31b4e091e2b0aa82497e619aa3bd7857213ae58252"
                 }
               ]
             }
@@ -500,7 +531,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "46b3b369f18fd6d96d2be6098712329c4c1df6e75540004049bff28656c340c3"
+                  "bytes": "afd5b6b033069eaed094880cd101ef3845e7f3a3afb826b26b758f0099597229"
                 }
               ]
             }
@@ -522,7 +553,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "e491357a9b1e04414f94b6eb48895805032279c7bab74fc22cdf1aad082398af"
+                  "bytes": "999cf48c3612ac85c33ff455695fc4e89747c82ed1761c32f2e679cd5799925f"
                 }
               ]
             }
@@ -700,7 +731,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "178347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                  "bytes": "97c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                 }
               ]
             },
@@ -720,7 +751,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "178347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                      "bytes": "97c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                     }
                   ]
                 },
@@ -745,7 +776,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "278347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                  "bytes": "a7c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                 }
               ]
             },
@@ -765,7 +796,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "278347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                      "bytes": "a7c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                     }
                   ]
                 },
@@ -790,7 +821,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "468347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                  "bytes": "c6c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                 }
               ]
             },
@@ -810,7 +841,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "468347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                      "bytes": "c6c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                     }
                   ]
                 },
@@ -1590,6 +1621,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "10000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1675,7 +1794,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1694,7 +1813,52 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "10b2715acce0961d9894db9cb4a163369b92c6626bceea18a69f07ab45626cc4"
+                  "bytes": "1176ac4d14a8985d2f763ea4e2dc0ddae56846dfe9eb13ee39b8d8bf756d9fca"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "1176ac4d14a8985d2f763ea4e2dc0ddae56846dfe9eb13ee39b8d8bf756d9fca"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "76c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                 }
               ]
             },
@@ -1714,7 +1878,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "10b2715acce0961d9894db9cb4a163369b92c6626bceea18a69f07ab45626cc4"
+                      "bytes": "76c9ec03cf3958ca8135e9bcda97f8145545ced43809255febee3302416add6b"
                     }
                   ]
                 },
@@ -1739,7 +1903,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "46b3b369f18fd6d96d2be6098712329c4c1df6e75540004049bff28656c340c3"
+                  "bytes": "7f737f66e12c2066913a8d31b4e091e2b0aa82497e619aa3bd7857213ae58252"
                 }
               ]
             },
@@ -1759,7 +1923,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "46b3b369f18fd6d96d2be6098712329c4c1df6e75540004049bff28656c340c3"
+                      "bytes": "7f737f66e12c2066913a8d31b4e091e2b0aa82497e619aa3bd7857213ae58252"
                     }
                   ]
                 },
@@ -1784,7 +1948,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "576a1dbd48c98b7d2dd6c377aa31feb9f83704b9bf71ae65db443253b14e937d"
+                  "bytes": "999cf48c3612ac85c33ff455695fc4e89747c82ed1761c32f2e679cd5799925f"
                 }
               ]
             },
@@ -1804,7 +1968,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "576a1dbd48c98b7d2dd6c377aa31feb9f83704b9bf71ae65db443253b14e937d"
+                      "bytes": "999cf48c3612ac85c33ff455695fc4e89747c82ed1761c32f2e679cd5799925f"
                     }
                   ]
                 },
@@ -1829,7 +1993,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b8b2ab78ed3fafaa376de8136ee4b170da955533b06bab2681ea6460bf8c47c6"
+                  "bytes": "a726bb825d1902f2b492e770a71a84ba2e4ee7f8951dfade66316bd766feea7b"
                 }
               ]
             },
@@ -1849,7 +2013,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b8b2ab78ed3fafaa376de8136ee4b170da955533b06bab2681ea6460bf8c47c6"
+                      "bytes": "a726bb825d1902f2b492e770a71a84ba2e4ee7f8951dfade66316bd766feea7b"
                     }
                   ]
                 },
@@ -1874,7 +2038,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b95c7577122d4e604293d7d27935d9ac7dbdd757b259c34bc868f1568d763edf"
+                  "bytes": "afd5b6b033069eaed094880cd101ef3845e7f3a3afb826b26b758f0099597229"
                 }
               ]
             },
@@ -1894,7 +2058,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b95c7577122d4e604293d7d27935d9ac7dbdd757b259c34bc868f1568d763edf"
+                      "bytes": "afd5b6b033069eaed094880cd101ef3845e7f3a3afb826b26b758f0099597229"
                     }
                   ]
                 },
@@ -1919,7 +2083,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e491357a9b1e04414f94b6eb48895805032279c7bab74fc22cdf1aad082398af"
+                  "bytes": "bec70b84f800d22864fdd9fe9f8c68dff270246685eccbf081658e1c5d7a9e04"
                 }
               ]
             },
@@ -1939,7 +2103,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e491357a9b1e04414f94b6eb48895805032279c7bab74fc22cdf1aad082398af"
+                      "bytes": "bec70b84f800d22864fdd9fe9f8c68dff270246685eccbf081658e1c5d7a9e04"
                     }
                   ]
                 },
@@ -1964,7 +2128,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f68347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                  "bytes": "e279d3e600a3e84f04d2e3ea5acb4b20fc31b9d186610c4e2e6889d791d8eaba"
                 }
               ]
             },
@@ -1984,7 +2148,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f68347e21118bd2f10221d9ae6af4232b7be07a5d355c2f309e08f0e99aeb995"
+                      "bytes": "e279d3e600a3e84f04d2e3ea5acb4b20fc31b9d186610c4e2e6889d791d8eaba"
                     }
                   ]
                 },
@@ -1999,6 +2163,63 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -2389,7 +2610,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "3126073502131104533"
+                "nonce": "4270020994084947596"
               }
             },
             "durability": "temporary"
@@ -2404,7 +2625,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "3126073502131104533"
+                    "nonce": "4270020994084947596"
                   }
                 },
                 "durability": "temporary",
@@ -2422,7 +2643,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "4270020994084947596"
+                "nonce": "6517132746326325848"
               }
             },
             "durability": "temporary"
@@ -2437,7 +2658,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "4270020994084947596"
+                    "nonce": "6517132746326325848"
                   }
                 },
                 "durability": "temporary",
@@ -2455,7 +2676,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "6517132746326325848"
+                "nonce": "7270604957039011794"
               }
             },
             "durability": "temporary"
@@ -2470,7 +2691,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "6517132746326325848"
+                    "nonce": "7270604957039011794"
                   }
                 },
                 "durability": "temporary",
@@ -2548,6 +2769,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "3126073502131104533"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "3126073502131104533"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/contributions/cancel_clears_contributor_amounts_so_replay_state_is_clean.1.json b/contracts/events/test_snapshots/tests/contributions/cancel_clears_contributor_amounts_so_replay_state_is_clean.1.json
index 82a2a01..a0fec3d 100644
--- a/contracts/events/test_snapshots/tests/contributions/cancel_clears_contributor_amounts_so_replay_state_is_clean.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/cancel_clears_contributor_amounts_so_replay_state_is_clean.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "698ede4d0ac26d92ed9be2272d24f7fe2e566ca90deaa74d9a7631a1f8470c77"
+                  "bytes": "c06ebb383b40d9d8695e1e7f37fcff44cdfbb75bfdd28333b4fae4562abdcc3c"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "2500000000"
                 },
                 {
-                  "bytes": "8460fda14077fd30c41a6b8b23910cc060d88ac0a1a6154a2e761a6b930cfbc3"
+                  "bytes": "69cb3f1946a0ba4fadbdc14bc8e9db8ed4afca13e0a2306db617ccc5625b0e72"
                 }
               ]
             }
@@ -337,7 +337,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "2e7dd0e6f31a132fd9534d9455744b61b0172000dad9bc2ee35e2ea59185d059"
+                  "bytes": "78ecf59e0dc34e44181a974fc1df305d3fcc43726cfe22d32c2be09860d980ab"
                 }
               ]
             }
@@ -363,7 +363,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "b99249d8f7a527598f8b41d955b38372c7bd634ff974c24ad92f4d74906f5f32"
+                  "bytes": "a6e7107003babe737130891045fd84740c55d5cc919fdaa3fad248def285a854"
                 }
               ]
             }
@@ -385,7 +385,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "969a90709e0ed157159d4658384dc325f7f5dc28ece898fd6e1e71b9a0244e53"
+                  "bytes": "b0cfdb9a1199e3d34a10df7b58ae45d165303c98b067172cff905973a82ec3f9"
                 }
               ]
             }
@@ -1011,7 +1011,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2e7dd0e6f31a132fd9534d9455744b61b0172000dad9bc2ee35e2ea59185d059"
+                  "bytes": "69cb3f1946a0ba4fadbdc14bc8e9db8ed4afca13e0a2306db617ccc5625b0e72"
                 }
               ]
             },
@@ -1031,7 +1031,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2e7dd0e6f31a132fd9534d9455744b61b0172000dad9bc2ee35e2ea59185d059"
+                      "bytes": "69cb3f1946a0ba4fadbdc14bc8e9db8ed4afca13e0a2306db617ccc5625b0e72"
                     }
                   ]
                 },
@@ -1056,7 +1056,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "698ede4d0ac26d92ed9be2272d24f7fe2e566ca90deaa74d9a7631a1f8470c77"
+                  "bytes": "78ecf59e0dc34e44181a974fc1df305d3fcc43726cfe22d32c2be09860d980ab"
                 }
               ]
             },
@@ -1076,7 +1076,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "698ede4d0ac26d92ed9be2272d24f7fe2e566ca90deaa74d9a7631a1f8470c77"
+                      "bytes": "78ecf59e0dc34e44181a974fc1df305d3fcc43726cfe22d32c2be09860d980ab"
                     }
                   ]
                 },
@@ -1101,7 +1101,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8460fda14077fd30c41a6b8b23910cc060d88ac0a1a6154a2e761a6b930cfbc3"
+                  "bytes": "a6e7107003babe737130891045fd84740c55d5cc919fdaa3fad248def285a854"
                 }
               ]
             },
@@ -1121,7 +1121,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8460fda14077fd30c41a6b8b23910cc060d88ac0a1a6154a2e761a6b930cfbc3"
+                      "bytes": "a6e7107003babe737130891045fd84740c55d5cc919fdaa3fad248def285a854"
                     }
                   ]
                 },
@@ -1146,7 +1146,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "969a90709e0ed157159d4658384dc325f7f5dc28ece898fd6e1e71b9a0244e53"
+                  "bytes": "b0cfdb9a1199e3d34a10df7b58ae45d165303c98b067172cff905973a82ec3f9"
                 }
               ]
             },
@@ -1166,7 +1166,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "969a90709e0ed157159d4658384dc325f7f5dc28ece898fd6e1e71b9a0244e53"
+                      "bytes": "b0cfdb9a1199e3d34a10df7b58ae45d165303c98b067172cff905973a82ec3f9"
                     }
                   ]
                 },
@@ -1191,7 +1191,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b99249d8f7a527598f8b41d955b38372c7bd634ff974c24ad92f4d74906f5f32"
+                  "bytes": "c06ebb383b40d9d8695e1e7f37fcff44cdfbb75bfdd28333b4fae4562abdcc3c"
                 }
               ]
             },
@@ -1211,7 +1211,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b99249d8f7a527598f8b41d955b38372c7bd634ff974c24ad92f4d74906f5f32"
+                      "bytes": "c06ebb383b40d9d8695e1e7f37fcff44cdfbb75bfdd28333b4fae4562abdcc3c"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/cancel_with_no_contributors_refunds_owner_in_full.1.json b/contracts/events/test_snapshots/tests/contributions/cancel_with_no_contributors_refunds_owner_in_full.1.json
index 376799c..7ddf2a7 100644
--- a/contracts/events/test_snapshots/tests/contributions/cancel_with_no_contributors_refunds_owner_in_full.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/cancel_with_no_contributors_refunds_owner_in_full.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "d7da2f2093b9462515ff839e5c8b1dbebbe19f176ac959f8d2e0c9284f00d20f"
+                  "bytes": "93922db757bef015a02c8210065fd354f2cfae08fcbddca497eaa2be8d3605fb"
                 }
               ]
             }
@@ -267,7 +267,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "7e3fd10b7314dc3274e32e1c475dc8bdfd456d6fddf7a5303060af81e8763d11"
+                  "bytes": "4ba46b849056027ad321f81e5c4d7df540ebea9ce8e604c984fc05af2bbe8035"
                 }
               ]
             }
@@ -697,7 +697,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7e3fd10b7314dc3274e32e1c475dc8bdfd456d6fddf7a5303060af81e8763d11"
+                  "bytes": "4ba46b849056027ad321f81e5c4d7df540ebea9ce8e604c984fc05af2bbe8035"
                 }
               ]
             },
@@ -717,7 +717,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7e3fd10b7314dc3274e32e1c475dc8bdfd456d6fddf7a5303060af81e8763d11"
+                      "bytes": "4ba46b849056027ad321f81e5c4d7df540ebea9ce8e604c984fc05af2bbe8035"
                     }
                   ]
                 },
@@ -742,7 +742,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d7da2f2093b9462515ff839e5c8b1dbebbe19f176ac959f8d2e0c9284f00d20f"
+                  "bytes": "93922db757bef015a02c8210065fd354f2cfae08fcbddca497eaa2be8d3605fb"
                 }
               ]
             },
@@ -762,7 +762,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d7da2f2093b9462515ff839e5c8b1dbebbe19f176ac959f8d2e0c9284f00d20f"
+                      "bytes": "93922db757bef015a02c8210065fd354f2cfae08fcbddca497eaa2be8d3605fb"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/cancel_with_owner_top_up_keeps_owner_residual_correct.1.json b/contracts/events/test_snapshots/tests/contributions/cancel_with_owner_top_up_keeps_owner_residual_correct.1.json
index 679f9aa..e1f0c43 100644
--- a/contracts/events/test_snapshots/tests/contributions/cancel_with_owner_top_up_keeps_owner_residual_correct.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/cancel_with_owner_top_up_keeps_owner_residual_correct.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "b96a38d5bb68e02ffed727986beff47400c3867aa4e9dd4ddc6919f2f28dd161"
+                  "bytes": "4788519a857210f328ad790bf88c84c99af2f4e39508ab5a16478a85027a30f9"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "1e1da2f99bcbb2fe98b1b3f65524f50e8d7b309592244faaccac67d9acea320d"
+                  "bytes": "5c6e0c450e72fa1fe1c81b16778c8c0b2ab4b32232a8d68642469ef189fedb5a"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "3000000000"
                 },
                 {
-                  "bytes": "8707181d8d0c33bf66a5da768e40181a28320e238558dc45b37efea180076c69"
+                  "bytes": "2e1b3adecca5ca0a2b87ef32935efac25c52ab8b2f4cd3508f5b624aa3c085c8"
                 }
               ]
             }
@@ -410,7 +410,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "b0a37923d899a2fbc928e3205f7556f873e9979694ae790c131c56ac688b0452"
+                  "bytes": "80b3d6c2f3d59c2dc7862560f13c7c63fd129f4ccf4d4e34dec5668804122da6"
                 }
               ]
             }
@@ -436,7 +436,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "ac9b2a5a296fcd45da8e507d371a6f150e211b7008b388c87d90db616a642037"
+                  "bytes": "94b1945096abfd857912d82ad3678426a5082754a9773e95118d32296a9f2af6"
                 }
               ]
             }
@@ -458,7 +458,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "024fc6c0fbcd3f75a072278fdaf0c358e7751c06084ae57132097f12cf9d5347"
+                  "bytes": "55af63ad5dcb7ee2606497b27f48279ff00ec2d71f22850370b89a6adf18369f"
                 }
               ]
             }
@@ -1086,7 +1086,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "024fc6c0fbcd3f75a072278fdaf0c358e7751c06084ae57132097f12cf9d5347"
+                  "bytes": "2e1b3adecca5ca0a2b87ef32935efac25c52ab8b2f4cd3508f5b624aa3c085c8"
                 }
               ]
             },
@@ -1106,7 +1106,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "024fc6c0fbcd3f75a072278fdaf0c358e7751c06084ae57132097f12cf9d5347"
+                      "bytes": "2e1b3adecca5ca0a2b87ef32935efac25c52ab8b2f4cd3508f5b624aa3c085c8"
                     }
                   ]
                 },
@@ -1131,7 +1131,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1e1da2f99bcbb2fe98b1b3f65524f50e8d7b309592244faaccac67d9acea320d"
+                  "bytes": "4788519a857210f328ad790bf88c84c99af2f4e39508ab5a16478a85027a30f9"
                 }
               ]
             },
@@ -1151,7 +1151,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1e1da2f99bcbb2fe98b1b3f65524f50e8d7b309592244faaccac67d9acea320d"
+                      "bytes": "4788519a857210f328ad790bf88c84c99af2f4e39508ab5a16478a85027a30f9"
                     }
                   ]
                 },
@@ -1176,7 +1176,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8707181d8d0c33bf66a5da768e40181a28320e238558dc45b37efea180076c69"
+                  "bytes": "55af63ad5dcb7ee2606497b27f48279ff00ec2d71f22850370b89a6adf18369f"
                 }
               ]
             },
@@ -1196,7 +1196,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8707181d8d0c33bf66a5da768e40181a28320e238558dc45b37efea180076c69"
+                      "bytes": "55af63ad5dcb7ee2606497b27f48279ff00ec2d71f22850370b89a6adf18369f"
                     }
                   ]
                 },
@@ -1221,7 +1221,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ac9b2a5a296fcd45da8e507d371a6f150e211b7008b388c87d90db616a642037"
+                  "bytes": "5c6e0c450e72fa1fe1c81b16778c8c0b2ab4b32232a8d68642469ef189fedb5a"
                 }
               ]
             },
@@ -1241,7 +1241,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ac9b2a5a296fcd45da8e507d371a6f150e211b7008b388c87d90db616a642037"
+                      "bytes": "5c6e0c450e72fa1fe1c81b16778c8c0b2ab4b32232a8d68642469ef189fedb5a"
                     }
                   ]
                 },
@@ -1266,7 +1266,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b0a37923d899a2fbc928e3205f7556f873e9979694ae790c131c56ac688b0452"
+                  "bytes": "80b3d6c2f3d59c2dc7862560f13c7c63fd129f4ccf4d4e34dec5668804122da6"
                 }
               ]
             },
@@ -1286,7 +1286,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b0a37923d899a2fbc928e3205f7556f873e9979694ae790c131c56ac688b0452"
+                      "bytes": "80b3d6c2f3d59c2dc7862560f13c7c63fd129f4ccf4d4e34dec5668804122da6"
                     }
                   ]
                 },
@@ -1311,7 +1311,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b96a38d5bb68e02ffed727986beff47400c3867aa4e9dd4ddc6919f2f28dd161"
+                  "bytes": "94b1945096abfd857912d82ad3678426a5082754a9773e95118d32296a9f2af6"
                 }
               ]
             },
@@ -1331,7 +1331,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b96a38d5bb68e02ffed727986beff47400c3867aa4e9dd4ddc6919f2f28dd161"
+                      "bytes": "94b1945096abfd857912d82ad3678426a5082754a9773e95118d32296a9f2af6"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/cancel_with_partner_pool_refunds_partners_then_owner_residual.1.json b/contracts/events/test_snapshots/tests/contributions/cancel_with_partner_pool_refunds_partners_then_owner_residual.1.json
index 43d8b3f..d1a525f 100644
--- a/contracts/events/test_snapshots/tests/contributions/cancel_with_partner_pool_refunds_partners_then_owner_residual.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/cancel_with_partner_pool_refunds_partners_then_owner_residual.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "cd346e85beb9f74051c5b3fe1b9cf94ca225da76f52c141d967f9f9fe6b2cade"
+                  "bytes": "886e35e9cb1f800aea6de8980bebb2e8ba0b63a8553788ad2e0344e31795fe47"
                 }
               ]
             }
@@ -316,7 +316,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "d994a28844839690386f5777d9ff25931c6a36ced11e889a3a4dd6ee4571bd71"
+                  "bytes": "d754dfb849e6fa39ac83cc254f28cb38f166fffaaf6056431c7d378553d586b7"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "3000000000"
                 },
                 {
-                  "bytes": "c00e60a4aff2c92bada300fc8e6536318d5f0fe5a9940f17f7e116815289d134"
+                  "bytes": "33e64435ad00dae39b028366a63f4b0cb41216deea45cc63ff5496794a01cf2f"
                 }
               ]
             }
@@ -411,7 +411,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "3efda55e6c3988fd70c71f149ec91550550372c39415a673506d522711bceebe"
+                  "bytes": "7f923be7661e8bee6c2c7a655528c7d906cb24c768223dca13afc1b1ba93d11c"
                 }
               ]
             }
@@ -437,7 +437,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "63eada4c4d17f020ea1e67d6822ccb0f15f8ec14634897ec161c1d99fd3107a1"
+                  "bytes": "ae1ed50317856e8451aac893ed981e23f80c618b34bf1f59148f263cd5fd6d99"
                 }
               ]
             }
@@ -459,7 +459,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "179c46cb51ecfc61ca17c2929db358c100e0213a19fa81a08bea7e81188623eb"
+                  "bytes": "c110e799fa760efbbb737746aa46959ddb6fcfbf09ff877e22804732f5829ca2"
                 }
               ]
             }
@@ -1241,7 +1241,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "179c46cb51ecfc61ca17c2929db358c100e0213a19fa81a08bea7e81188623eb"
+                  "bytes": "33e64435ad00dae39b028366a63f4b0cb41216deea45cc63ff5496794a01cf2f"
                 }
               ]
             },
@@ -1261,7 +1261,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "179c46cb51ecfc61ca17c2929db358c100e0213a19fa81a08bea7e81188623eb"
+                      "bytes": "33e64435ad00dae39b028366a63f4b0cb41216deea45cc63ff5496794a01cf2f"
                     }
                   ]
                 },
@@ -1286,7 +1286,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3efda55e6c3988fd70c71f149ec91550550372c39415a673506d522711bceebe"
+                  "bytes": "7f923be7661e8bee6c2c7a655528c7d906cb24c768223dca13afc1b1ba93d11c"
                 }
               ]
             },
@@ -1306,7 +1306,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3efda55e6c3988fd70c71f149ec91550550372c39415a673506d522711bceebe"
+                      "bytes": "7f923be7661e8bee6c2c7a655528c7d906cb24c768223dca13afc1b1ba93d11c"
                     }
                   ]
                 },
@@ -1331,7 +1331,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "63eada4c4d17f020ea1e67d6822ccb0f15f8ec14634897ec161c1d99fd3107a1"
+                  "bytes": "886e35e9cb1f800aea6de8980bebb2e8ba0b63a8553788ad2e0344e31795fe47"
                 }
               ]
             },
@@ -1351,7 +1351,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "63eada4c4d17f020ea1e67d6822ccb0f15f8ec14634897ec161c1d99fd3107a1"
+                      "bytes": "886e35e9cb1f800aea6de8980bebb2e8ba0b63a8553788ad2e0344e31795fe47"
                     }
                   ]
                 },
@@ -1376,7 +1376,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c00e60a4aff2c92bada300fc8e6536318d5f0fe5a9940f17f7e116815289d134"
+                  "bytes": "ae1ed50317856e8451aac893ed981e23f80c618b34bf1f59148f263cd5fd6d99"
                 }
               ]
             },
@@ -1396,7 +1396,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c00e60a4aff2c92bada300fc8e6536318d5f0fe5a9940f17f7e116815289d134"
+                      "bytes": "ae1ed50317856e8451aac893ed981e23f80c618b34bf1f59148f263cd5fd6d99"
                     }
                   ]
                 },
@@ -1421,7 +1421,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cd346e85beb9f74051c5b3fe1b9cf94ca225da76f52c141d967f9f9fe6b2cade"
+                  "bytes": "c110e799fa760efbbb737746aa46959ddb6fcfbf09ff877e22804732f5829ca2"
                 }
               ]
             },
@@ -1441,7 +1441,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cd346e85beb9f74051c5b3fe1b9cf94ca225da76f52c141d967f9f9fe6b2cade"
+                      "bytes": "c110e799fa760efbbb737746aa46959ddb6fcfbf09ff877e22804732f5829ca2"
                     }
                   ]
                 },
@@ -1466,7 +1466,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d994a28844839690386f5777d9ff25931c6a36ced11e889a3a4dd6ee4571bd71"
+                  "bytes": "d754dfb849e6fa39ac83cc254f28cb38f166fffaaf6056431c7d378553d586b7"
                 }
               ]
             },
@@ -1486,7 +1486,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d994a28844839690386f5777d9ff25931c6a36ced11e889a3a4dd6ee4571bd71"
+                      "bytes": "d754dfb849e6fa39ac83cc254f28cb38f166fffaaf6056431c7d378553d586b7"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/multiple_top_ups_from_same_contributor_aggregate_and_dont_duplicate_list.1.json b/contracts/events/test_snapshots/tests/contributions/multiple_top_ups_from_same_contributor_aggregate_and_dont_duplicate_list.1.json
index 7f18e45..edc60a0 100644
--- a/contracts/events/test_snapshots/tests/contributions/multiple_top_ups_from_same_contributor_aggregate_and_dont_duplicate_list.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/multiple_top_ups_from_same_contributor_aggregate_and_dont_duplicate_list.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "bd97c74f53422b71499eb3d3191a85a1fee5117470bb3a81e2f4f925df1a552e"
+                  "bytes": "d8b1ba3666aa87f6e90b530c23e0083db42ef19d192d347888048acaa6487bbd"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "010fb73789ecbf8cb2bac2f0e3ce61678cc41eb3a46e3854aed35890c4cf931e"
+                  "bytes": "f8670006bc35f76a1368590ef067a1967e67cd1ee195423d7ddcc38f3e726201"
                 }
               ]
             }
@@ -343,7 +343,7 @@
                   "i128": "200000000"
                 },
                 {
-                  "bytes": "2a905561658f39b50680a389dfdcfd8db3cb4f13ec75c151da8907d1929cdaa6"
+                  "bytes": "d33383075de85e561983b67e82980e9d7b0b98cd84dd02fc4c346465606afc5a"
                 }
               ]
             }
@@ -991,7 +991,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "010fb73789ecbf8cb2bac2f0e3ce61678cc41eb3a46e3854aed35890c4cf931e"
+                  "bytes": "d33383075de85e561983b67e82980e9d7b0b98cd84dd02fc4c346465606afc5a"
                 }
               ]
             },
@@ -1011,7 +1011,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "010fb73789ecbf8cb2bac2f0e3ce61678cc41eb3a46e3854aed35890c4cf931e"
+                      "bytes": "d33383075de85e561983b67e82980e9d7b0b98cd84dd02fc4c346465606afc5a"
                     }
                   ]
                 },
@@ -1036,7 +1036,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2a905561658f39b50680a389dfdcfd8db3cb4f13ec75c151da8907d1929cdaa6"
+                  "bytes": "d8b1ba3666aa87f6e90b530c23e0083db42ef19d192d347888048acaa6487bbd"
                 }
               ]
             },
@@ -1056,7 +1056,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2a905561658f39b50680a389dfdcfd8db3cb4f13ec75c151da8907d1929cdaa6"
+                      "bytes": "d8b1ba3666aa87f6e90b530c23e0083db42ef19d192d347888048acaa6487bbd"
                     }
                   ]
                 },
@@ -1081,7 +1081,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bd97c74f53422b71499eb3d3191a85a1fee5117470bb3a81e2f4f925df1a552e"
+                  "bytes": "f8670006bc35f76a1368590ef067a1967e67cd1ee195423d7ddcc38f3e726201"
                 }
               ]
             },
@@ -1101,7 +1101,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bd97c74f53422b71499eb3d3191a85a1fee5117470bb3a81e2f4f925df1a552e"
+                      "bytes": "f8670006bc35f76a1368590ef067a1967e67cd1ee195423d7ddcc38f3e726201"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/owner_top_up_grows_escrow_without_recording_contribution_entry.1.json b/contracts/events/test_snapshots/tests/contributions/owner_top_up_grows_escrow_without_recording_contribution_entry.1.json
index ee75831..f9e5f40 100644
--- a/contracts/events/test_snapshots/tests/contributions/owner_top_up_grows_escrow_without_recording_contribution_entry.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/owner_top_up_grows_escrow_without_recording_contribution_entry.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "ad9116b3bd4fd073b5a7313dbb5382e5d30fbb14a272638108ea2c042c3141c5"
+                  "bytes": "6d51614f4002498efbfbecb75ea3944c9925b7e075bcb8a70c9f305e0ee01d95"
                 }
               ]
             }
@@ -295,7 +295,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "83a33d35c8085108fcd3f20ceea8dd4f221563bd367a322f372597e986afa927"
+                  "bytes": "7318c2273c7e67f97e421a2709b24e85f11190de89db4fe35cc286f552fcbf2e"
                 }
               ]
             }
@@ -746,7 +746,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "83a33d35c8085108fcd3f20ceea8dd4f221563bd367a322f372597e986afa927"
+                  "bytes": "6d51614f4002498efbfbecb75ea3944c9925b7e075bcb8a70c9f305e0ee01d95"
                 }
               ]
             },
@@ -766,7 +766,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "83a33d35c8085108fcd3f20ceea8dd4f221563bd367a322f372597e986afa927"
+                      "bytes": "6d51614f4002498efbfbecb75ea3944c9925b7e075bcb8a70c9f305e0ee01d95"
                     }
                   ]
                 },
@@ -791,7 +791,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ad9116b3bd4fd073b5a7313dbb5382e5d30fbb14a272638108ea2c042c3141c5"
+                  "bytes": "7318c2273c7e67f97e421a2709b24e85f11190de89db4fe35cc286f552fcbf2e"
                 }
               ]
             },
@@ -811,7 +811,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ad9116b3bd4fd073b5a7313dbb5382e5d30fbb14a272638108ea2c042c3141c5"
+                      "bytes": "7318c2273c7e67f97e421a2709b24e85f11190de89db4fe35cc286f552fcbf2e"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/paged_cancel_owner_only_settles_inside_start.1.json b/contracts/events/test_snapshots/tests/contributions/paged_cancel_owner_only_settles_inside_start.1.json
index b6ef061..8a0d267 100644
--- a/contracts/events/test_snapshots/tests/contributions/paged_cancel_owner_only_settles_inside_start.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/paged_cancel_owner_only_settles_inside_start.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "7c1a6682b3b579e8533dae6ce498fc4b0789a692858562fa691befedc6cc83c4"
+                  "bytes": "4777244c5614a5301dc35e32bf4f7f256f690ca6fd1b71e644de770d53c57d8b"
                 }
               ]
             }
@@ -267,7 +267,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "63434c69d67317e96c232b83f216e44b9de4fc8e0c9120e3dcb521b84f31d932"
+                  "bytes": "2ddce8daa036f5b866eaa5ceb636f1bb14da8eca439b936f0235f8a9ac3d9cac"
                 }
               ]
             }
@@ -698,7 +698,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "63434c69d67317e96c232b83f216e44b9de4fc8e0c9120e3dcb521b84f31d932"
+                  "bytes": "2ddce8daa036f5b866eaa5ceb636f1bb14da8eca439b936f0235f8a9ac3d9cac"
                 }
               ]
             },
@@ -718,7 +718,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "63434c69d67317e96c232b83f216e44b9de4fc8e0c9120e3dcb521b84f31d932"
+                      "bytes": "2ddce8daa036f5b866eaa5ceb636f1bb14da8eca439b936f0235f8a9ac3d9cac"
                     }
                   ]
                 },
@@ -743,7 +743,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7c1a6682b3b579e8533dae6ce498fc4b0789a692858562fa691befedc6cc83c4"
+                  "bytes": "4777244c5614a5301dc35e32bf4f7f256f690ca6fd1b71e644de770d53c57d8b"
                 }
               ]
             },
@@ -763,7 +763,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7c1a6682b3b579e8533dae6ce498fc4b0789a692858562fa691befedc6cc83c4"
+                      "bytes": "4777244c5614a5301dc35e32bf4f7f256f690ca6fd1b71e644de770d53c57d8b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/paged_cancel_processes_in_batches.1.json b/contracts/events/test_snapshots/tests/contributions/paged_cancel_processes_in_batches.1.json
index 13d48fd..dd1d1dd 100644
--- a/contracts/events/test_snapshots/tests/contributions/paged_cancel_processes_in_batches.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/paged_cancel_processes_in_batches.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "c9a118b23b34f1beeaddcf5946b1bd52d7d200cdc0b867b151e2c5a59cf87867"
+                  "bytes": "6e260429f171986616c2ed63e0be223b2f8244ab2072d372335ccc1a04fd9f0d"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "2f4c0e30e9bd790435e0764f51a9f98316eb9f7121cedaed9a3b37174b97e93b"
+                  "bytes": "4e2694b013868b25c0f989e6e0352921e64d91b28261aefed3cbf4838d6ff95f"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "6c3f5d63fae85f4219983ca9345a1818c3d46b69882083c933a8d34ddd7f251b"
+                  "bytes": "3f9bb7d1a4b3c6e400a36b81aa8d9b80b9a4b659dce2b23fa55416648d05fac4"
                 }
               ]
             }
@@ -436,7 +436,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "4a93e29967cf867bddf2d0405cf5615f415a0030a6fa7da0e47ad1aec9b704a6"
+                  "bytes": "dcf27b15879cb83aebba5beb40429d116961964af02863c14cd9de2fdc651c03"
                 }
               ]
             }
@@ -507,7 +507,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "0b7001418a723de5d463f73fead95449aab98bcb3b001d419ee8f33edd6e4f83"
+                  "bytes": "6c1901cff31263d720b845dee7e5ce7d74fdbeeaa8a0dd76743fd6f938bd725e"
                 }
               ]
             }
@@ -578,7 +578,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "0cc385b6ff773137d474aeca8dc983de0d2f69ba5202beca752fd44dbd1f7f68"
+                  "bytes": "e6df1efc9bc289f4a2332c6f9a4fe479f8de7b016bec8887bac3884e03551368"
                 }
               ]
             }
@@ -628,7 +628,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "8d5afe106dd5022df1ab3e0d42fc31de1e0095694aa16f2ca3f5d62970ec0ac8"
+                  "bytes": "f8f2d128225bc08cef06dc4e3e0ef31eaff48a3b1f3c6067fee8e8e168f315c6"
                 }
               ]
             }
@@ -655,7 +655,7 @@
                   "u32": 2
                 },
                 {
-                  "bytes": "2dd861b67b65788c3cd274ff2bc641634d7855c2cd146dd6fb4abef5efad492a"
+                  "bytes": "5a66f30275ab50a2e79b0268039e85bf151e899238f9b2924fa9c813123e06b4"
                 }
               ]
             }
@@ -680,7 +680,7 @@
                   "u32": 2
                 },
                 {
-                  "bytes": "d53da41120156f82fd39e51c039878b9f6e5a385c357bf24a8d0f6fb015825ca"
+                  "bytes": "73f0c906b07f8cd310ce4a3c6d5ffedf1f579e75db7daceffd9a9c292cd1ddf3"
                 }
               ]
             }
@@ -706,7 +706,7 @@
                   "u32": 2
                 },
                 {
-                  "bytes": "393c065de97598d6c0ae1e3ba4707d7a5188c00c94236f35803f742e35dbea3f"
+                  "bytes": "839f4a2d80598ea3abcba32e1dec3bd1f229b552d4f2b2f35b43928ecd56d6b6"
                 }
               ]
             }
@@ -728,7 +728,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "3618034147db34938c2397ff752a334fb59e2fe259271993f83fc5baa0eee7f7"
+                  "bytes": "06534a04e6b098aba69395df20f1c0f730136bfcd0d5c0d844979ee8acd7114b"
                 }
               ]
             }
@@ -1972,7 +1972,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0b7001418a723de5d463f73fead95449aab98bcb3b001d419ee8f33edd6e4f83"
+                  "bytes": "06534a04e6b098aba69395df20f1c0f730136bfcd0d5c0d844979ee8acd7114b"
                 }
               ]
             },
@@ -1992,7 +1992,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0b7001418a723de5d463f73fead95449aab98bcb3b001d419ee8f33edd6e4f83"
+                      "bytes": "06534a04e6b098aba69395df20f1c0f730136bfcd0d5c0d844979ee8acd7114b"
                     }
                   ]
                 },
@@ -2017,7 +2017,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0cc385b6ff773137d474aeca8dc983de0d2f69ba5202beca752fd44dbd1f7f68"
+                  "bytes": "3f9bb7d1a4b3c6e400a36b81aa8d9b80b9a4b659dce2b23fa55416648d05fac4"
                 }
               ]
             },
@@ -2037,7 +2037,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0cc385b6ff773137d474aeca8dc983de0d2f69ba5202beca752fd44dbd1f7f68"
+                      "bytes": "3f9bb7d1a4b3c6e400a36b81aa8d9b80b9a4b659dce2b23fa55416648d05fac4"
                     }
                   ]
                 },
@@ -2062,7 +2062,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2dd861b67b65788c3cd274ff2bc641634d7855c2cd146dd6fb4abef5efad492a"
+                  "bytes": "4e2694b013868b25c0f989e6e0352921e64d91b28261aefed3cbf4838d6ff95f"
                 }
               ]
             },
@@ -2082,7 +2082,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2dd861b67b65788c3cd274ff2bc641634d7855c2cd146dd6fb4abef5efad492a"
+                      "bytes": "4e2694b013868b25c0f989e6e0352921e64d91b28261aefed3cbf4838d6ff95f"
                     }
                   ]
                 },
@@ -2107,7 +2107,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2f4c0e30e9bd790435e0764f51a9f98316eb9f7121cedaed9a3b37174b97e93b"
+                  "bytes": "5a66f30275ab50a2e79b0268039e85bf151e899238f9b2924fa9c813123e06b4"
                 }
               ]
             },
@@ -2127,7 +2127,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2f4c0e30e9bd790435e0764f51a9f98316eb9f7121cedaed9a3b37174b97e93b"
+                      "bytes": "5a66f30275ab50a2e79b0268039e85bf151e899238f9b2924fa9c813123e06b4"
                     }
                   ]
                 },
@@ -2152,7 +2152,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3618034147db34938c2397ff752a334fb59e2fe259271993f83fc5baa0eee7f7"
+                  "bytes": "6c1901cff31263d720b845dee7e5ce7d74fdbeeaa8a0dd76743fd6f938bd725e"
                 }
               ]
             },
@@ -2172,7 +2172,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3618034147db34938c2397ff752a334fb59e2fe259271993f83fc5baa0eee7f7"
+                      "bytes": "6c1901cff31263d720b845dee7e5ce7d74fdbeeaa8a0dd76743fd6f938bd725e"
                     }
                   ]
                 },
@@ -2197,7 +2197,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "393c065de97598d6c0ae1e3ba4707d7a5188c00c94236f35803f742e35dbea3f"
+                  "bytes": "6e260429f171986616c2ed63e0be223b2f8244ab2072d372335ccc1a04fd9f0d"
                 }
               ]
             },
@@ -2217,7 +2217,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "393c065de97598d6c0ae1e3ba4707d7a5188c00c94236f35803f742e35dbea3f"
+                      "bytes": "6e260429f171986616c2ed63e0be223b2f8244ab2072d372335ccc1a04fd9f0d"
                     }
                   ]
                 },
@@ -2242,7 +2242,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4a93e29967cf867bddf2d0405cf5615f415a0030a6fa7da0e47ad1aec9b704a6"
+                  "bytes": "73f0c906b07f8cd310ce4a3c6d5ffedf1f579e75db7daceffd9a9c292cd1ddf3"
                 }
               ]
             },
@@ -2262,7 +2262,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4a93e29967cf867bddf2d0405cf5615f415a0030a6fa7da0e47ad1aec9b704a6"
+                      "bytes": "73f0c906b07f8cd310ce4a3c6d5ffedf1f579e75db7daceffd9a9c292cd1ddf3"
                     }
                   ]
                 },
@@ -2287,7 +2287,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6c3f5d63fae85f4219983ca9345a1818c3d46b69882083c933a8d34ddd7f251b"
+                  "bytes": "839f4a2d80598ea3abcba32e1dec3bd1f229b552d4f2b2f35b43928ecd56d6b6"
                 }
               ]
             },
@@ -2307,7 +2307,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6c3f5d63fae85f4219983ca9345a1818c3d46b69882083c933a8d34ddd7f251b"
+                      "bytes": "839f4a2d80598ea3abcba32e1dec3bd1f229b552d4f2b2f35b43928ecd56d6b6"
                     }
                   ]
                 },
@@ -2332,7 +2332,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8d5afe106dd5022df1ab3e0d42fc31de1e0095694aa16f2ca3f5d62970ec0ac8"
+                  "bytes": "dcf27b15879cb83aebba5beb40429d116961964af02863c14cd9de2fdc651c03"
                 }
               ]
             },
@@ -2352,7 +2352,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8d5afe106dd5022df1ab3e0d42fc31de1e0095694aa16f2ca3f5d62970ec0ac8"
+                      "bytes": "dcf27b15879cb83aebba5beb40429d116961964af02863c14cd9de2fdc651c03"
                     }
                   ]
                 },
@@ -2377,7 +2377,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c9a118b23b34f1beeaddcf5946b1bd52d7d200cdc0b867b151e2c5a59cf87867"
+                  "bytes": "e6df1efc9bc289f4a2332c6f9a4fe479f8de7b016bec8887bac3884e03551368"
                 }
               ]
             },
@@ -2397,7 +2397,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c9a118b23b34f1beeaddcf5946b1bd52d7d200cdc0b867b151e2c5a59cf87867"
+                      "bytes": "e6df1efc9bc289f4a2332c6f9a4fe479f8de7b016bec8887bac3884e03551368"
                     }
                   ]
                 },
@@ -2422,7 +2422,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d53da41120156f82fd39e51c039878b9f6e5a385c357bf24a8d0f6fb015825ca"
+                  "bytes": "f8f2d128225bc08cef06dc4e3e0ef31eaff48a3b1f3c6067fee8e8e168f315c6"
                 }
               ]
             },
@@ -2442,7 +2442,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d53da41120156f82fd39e51c039878b9f6e5a385c357bf24a8d0f6fb015825ca"
+                      "bytes": "f8f2d128225bc08cef06dc4e3e0ef31eaff48a3b1f3c6067fee8e8e168f315c6"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/replayed_add_funds_reverts.1.json b/contracts/events/test_snapshots/tests/contributions/replayed_add_funds_reverts.1.json
index 7b84b7d..33ccf22 100644
--- a/contracts/events/test_snapshots/tests/contributions/replayed_add_funds_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/replayed_add_funds_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "10411bdcf7363ef3e0ca8047efa0a25aed0885c28027f10fc1632d5af0791c4d"
+                  "bytes": "9460cb6800d98faedd7160149dc3f8b5283c1997d4b3d725f98c1c4d1cb85cc3"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "100000000"
                 },
                 {
-                  "bytes": "9b728dafe2c77d09c4762a948522327c635f5441a41b41c32c7b1b5c0e2fb659"
+                  "bytes": "4e24661564f3a0f5dbfb8c8694c5d46ef1fc88e05dda2b0863427c87341b8bfa"
                 }
               ]
             }
@@ -941,7 +941,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "10411bdcf7363ef3e0ca8047efa0a25aed0885c28027f10fc1632d5af0791c4d"
+                  "bytes": "4e24661564f3a0f5dbfb8c8694c5d46ef1fc88e05dda2b0863427c87341b8bfa"
                 }
               ]
             },
@@ -961,7 +961,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "10411bdcf7363ef3e0ca8047efa0a25aed0885c28027f10fc1632d5af0791c4d"
+                      "bytes": "4e24661564f3a0f5dbfb8c8694c5d46ef1fc88e05dda2b0863427c87341b8bfa"
                     }
                   ]
                 },
@@ -986,7 +986,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9b728dafe2c77d09c4762a948522327c635f5441a41b41c32c7b1b5c0e2fb659"
+                  "bytes": "9460cb6800d98faedd7160149dc3f8b5283c1997d4b3d725f98c1c4d1cb85cc3"
                 }
               ]
             },
@@ -1006,7 +1006,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9b728dafe2c77d09c4762a948522327c635f5441a41b41c32c7b1b5c0e2fb659"
+                      "bytes": "9460cb6800d98faedd7160149dc3f8b5283c1997d4b3d725f98c1c4d1cb85cc3"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/contributions/zero_or_negative_contribution_reverts.1.json b/contracts/events/test_snapshots/tests/contributions/zero_or_negative_contribution_reverts.1.json
index 885cadf..8214ebe 100644
--- a/contracts/events/test_snapshots/tests/contributions/zero_or_negative_contribution_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/contributions/zero_or_negative_contribution_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "695e5ff1488c8efa25a0b15abd7f66f0cea3fb83ee1a844fd61c0b1d6a6a9eb1"
+                  "bytes": "f124d7eb74a9c3a7ca96582355e57204a46cfcaa79007c35f5227d235d975449"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "695e5ff1488c8efa25a0b15abd7f66f0cea3fb83ee1a844fd61c0b1d6a6a9eb1"
+                  "bytes": "f124d7eb74a9c3a7ca96582355e57204a46cfcaa79007c35f5227d235d975449"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "695e5ff1488c8efa25a0b15abd7f66f0cea3fb83ee1a844fd61c0b1d6a6a9eb1"
+                      "bytes": "f124d7eb74a9c3a7ca96582355e57204a46cfcaa79007c35f5227d235d975449"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/add_funds_uses_event_override_not_global.1.json b/contracts/events/test_snapshots/tests/cross_contract/add_funds_uses_event_override_not_global.1.json
index fcadc8e..8eb96a6 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/add_funds_uses_event_override_not_global.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/add_funds_uses_event_override_not_global.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "2b79b68e2d9b4c7f37c6515f8d30d1bec18666ceae9af5f4eb42ddf5b19ae792"
+                  "bytes": "19576e5f3e7ece0bdf57f7058642e8976e9876661b972601bcfa4b805c93da5c"
                 }
               ]
             }
@@ -317,7 +317,7 @@
                   "i128": "10000000000"
                 },
                 {
-                  "bytes": "5daed03dffc9eeb298b134c18ce4a7d4ec01927df4417caa07d3c8348d9518d0"
+                  "bytes": "6c8c72f7b3efad4c55c79edc9c67ca84815330d8b286a14ecb41ee210c97fde8"
                 }
               ]
             }
@@ -1000,7 +1000,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2b79b68e2d9b4c7f37c6515f8d30d1bec18666ceae9af5f4eb42ddf5b19ae792"
+                  "bytes": "19576e5f3e7ece0bdf57f7058642e8976e9876661b972601bcfa4b805c93da5c"
                 }
               ]
             },
@@ -1020,7 +1020,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2b79b68e2d9b4c7f37c6515f8d30d1bec18666ceae9af5f4eb42ddf5b19ae792"
+                      "bytes": "19576e5f3e7ece0bdf57f7058642e8976e9876661b972601bcfa4b805c93da5c"
                     }
                   ]
                 },
@@ -1045,7 +1045,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5daed03dffc9eeb298b134c18ce4a7d4ec01927df4417caa07d3c8348d9518d0"
+                  "bytes": "6c8c72f7b3efad4c55c79edc9c67ca84815330d8b286a14ecb41ee210c97fde8"
                 }
               ]
             },
@@ -1065,7 +1065,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5daed03dffc9eeb298b134c18ce4a7d4ec01927df4417caa07d3c8348d9518d0"
+                      "bytes": "6c8c72f7b3efad4c55c79edc9c67ca84815330d8b286a14ecb41ee210c97fde8"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_requires_prior_application.1.json b/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_requires_prior_application.1.json
index d8445a6..68c48e0 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_requires_prior_application.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_requires_prior_application.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "82b2cf1d4b5840a745b9cc6c7b8a4e5be9344591e0c37b9cef78f6f6a8efc493"
+                  "bytes": "dabccc9b46fe311867b58acd743abb10ace2bd27f06d72092eba997a985c00b1"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "82b2cf1d4b5840a745b9cc6c7b8a4e5be9344591e0c37b9cef78f6f6a8efc493"
+                  "bytes": "dabccc9b46fe311867b58acd743abb10ace2bd27f06d72092eba997a985c00b1"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "82b2cf1d4b5840a745b9cc6c7b8a4e5be9344591e0c37b9cef78f6f6a8efc493"
+                      "bytes": "dabccc9b46fe311867b58acd743abb10ace2bd27f06d72092eba997a985c00b1"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_succeeds_after_apply.1.json b/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_succeeds_after_apply.1.json
index 6a38f87..c5f62af 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_succeeds_after_apply.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/bounty_submit_succeeds_after_apply.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "7d7207db23a4c94a92e8b827486211a20588996c68b92db5d047b9a04224ee6a"
+                  "bytes": "c380a0c15a9ea3ef6256911661b91b42138a7f910d89e882dcc36cb3e5a10208"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "dfee11e42c622fbe9b050f440cae1bac1b188435bcf32e4d1bed8a0df89fcc04"
+                  "bytes": "33b0bffdd833fc0f333299de6abc0f222cba2eabe27b9aaafda2c32892ddd901"
                 }
               ]
             }
@@ -297,7 +297,7 @@
                   "string": "ipfs://Qm.../bounty.json"
                 },
                 {
-                  "bytes": "8f0addaa5decfc8f463eccc2768d2ea61aa3d4500c2337ca42e89dc84354edaf"
+                  "bytes": "9c8ba838d700936f394472de12fb58da16fe07aa9ef9062a3dfb80c03e956942"
                 }
               ]
             }
@@ -422,7 +422,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6fee11e42c622fbe9b050f440cae1bac1b188435bcf32e4d1bed8a0df89fcc04"
+                  "bytes": "83b0bffdd833fc0f333299de6abc0f222cba2eabe27b9aaafda2c32892ddd901"
                 }
               ]
             },
@@ -442,7 +442,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6fee11e42c622fbe9b050f440cae1bac1b188435bcf32e4d1bed8a0df89fcc04"
+                      "bytes": "83b0bffdd833fc0f333299de6abc0f222cba2eabe27b9aaafda2c32892ddd901"
                     }
                   ]
                 },
@@ -1055,7 +1055,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7d7207db23a4c94a92e8b827486211a20588996c68b92db5d047b9a04224ee6a"
+                  "bytes": "33b0bffdd833fc0f333299de6abc0f222cba2eabe27b9aaafda2c32892ddd901"
                 }
               ]
             },
@@ -1075,7 +1075,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7d7207db23a4c94a92e8b827486211a20588996c68b92db5d047b9a04224ee6a"
+                      "bytes": "33b0bffdd833fc0f333299de6abc0f222cba2eabe27b9aaafda2c32892ddd901"
                     }
                   ]
                 },
@@ -1100,7 +1100,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8f0addaa5decfc8f463eccc2768d2ea61aa3d4500c2337ca42e89dc84354edaf"
+                  "bytes": "9c8ba838d700936f394472de12fb58da16fe07aa9ef9062a3dfb80c03e956942"
                 }
               ]
             },
@@ -1120,7 +1120,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8f0addaa5decfc8f463eccc2768d2ea61aa3d4500c2337ca42e89dc84354edaf"
+                      "bytes": "9c8ba838d700936f394472de12fb58da16fe07aa9ef9062a3dfb80c03e956942"
                     }
                   ]
                 },
@@ -1145,7 +1145,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dfee11e42c622fbe9b050f440cae1bac1b188435bcf32e4d1bed8a0df89fcc04"
+                  "bytes": "c380a0c15a9ea3ef6256911661b91b42138a7f910d89e882dcc36cb3e5a10208"
                 }
               ]
             },
@@ -1165,7 +1165,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dfee11e42c622fbe9b050f440cae1bac1b188435bcf32e4d1bed8a0df89fcc04"
+                      "bytes": "c380a0c15a9ea3ef6256911661b91b42138a7f910d89e882dcc36cb3e5a10208"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/cancel_after_select_winners_refunds_only_remaining.1.json b/contracts/events/test_snapshots/tests/cross_contract/cancel_after_select_winners_refunds_only_remaining.1.json
index 7dd39b4..108c7a1 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/cancel_after_select_winners_refunds_only_remaining.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/cancel_after_select_winners_refunds_only_remaining.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "cbcb800391b2a530500397e3991c5599db0e3a69bbce7ad9715d590732dc70cd"
+                  "bytes": "c8e9a7258ea23725a9a80a032571b2a7f74daa234f95d7257c6048a9766d80f4"
                 }
               ]
             }
@@ -306,7 +306,38 @@
                   ]
                 },
                 {
-                  "bytes": "28ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                  "bytes": "3af57e3b2ac9252392369297007d240cec08fffd34cedac900f9be0f83729c48"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "4e3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                 }
               ]
             }
@@ -329,7 +360,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "01a7bfa8955c3897cb7107ef97081e5a96ac7d8929536d904552fc8ecf17e809"
+                  "bytes": "2967d0a321b6ac5f3159c59dc4e93bbf13fea2b7051f6a822ba9704179fa1790"
                 }
               ]
             }
@@ -507,7 +538,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "98ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                  "bytes": "9f3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                 }
               ]
             },
@@ -527,7 +558,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "98ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                      "bytes": "9f3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                     }
                   ]
                 },
@@ -552,7 +583,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c9ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                  "bytes": "af3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                 }
               ]
             },
@@ -572,7 +603,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c9ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                      "bytes": "af3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                     }
                   ]
                 },
@@ -597,7 +628,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f9ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                  "bytes": "fe3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                 }
               ]
             },
@@ -617,7 +648,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f9ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                      "bytes": "fe3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                     }
                   ]
                 },
@@ -1046,6 +1077,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "60000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1131,7 +1250,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1150,7 +1269,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "01a7bfa8955c3897cb7107ef97081e5a96ac7d8929536d904552fc8ecf17e809"
+                  "bytes": "2967d0a321b6ac5f3159c59dc4e93bbf13fea2b7051f6a822ba9704179fa1790"
                 }
               ]
             },
@@ -1170,7 +1289,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "01a7bfa8955c3897cb7107ef97081e5a96ac7d8929536d904552fc8ecf17e809"
+                      "bytes": "2967d0a321b6ac5f3159c59dc4e93bbf13fea2b7051f6a822ba9704179fa1790"
                     }
                   ]
                 },
@@ -1195,7 +1314,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "28ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                  "bytes": "3af57e3b2ac9252392369297007d240cec08fffd34cedac900f9be0f83729c48"
                 }
               ]
             },
@@ -1215,7 +1334,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "28ec359e5bf1ee71fd024573de71219c3e7808b40b3a94868c684202630daf4b"
+                      "bytes": "3af57e3b2ac9252392369297007d240cec08fffd34cedac900f9be0f83729c48"
                     }
                   ]
                 },
@@ -1240,7 +1359,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cbcb800391b2a530500397e3991c5599db0e3a69bbce7ad9715d590732dc70cd"
+                  "bytes": "4e3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                 }
               ]
             },
@@ -1260,7 +1379,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cbcb800391b2a530500397e3991c5599db0e3a69bbce7ad9715d590732dc70cd"
+                      "bytes": "4e3867ffdfc9f5365ba27767fe17e254e9d18e1c58428ca3d7effe2456dc60a8"
                     }
                   ]
                 },
@@ -1275,6 +1394,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "c8e9a7258ea23725a9a80a032571b2a7f74daa234f95d7257c6048a9766d80f4"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "c8e9a7258ea23725a9a80a032571b2a7f74daa234f95d7257c6048a9766d80f4"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1566,7 +1787,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
             "key": {
               "ledger_key_nonce": {
-                "nonce": "6277191135259896685"
+                "nonce": "5806905060045992000"
               }
             },
             "durability": "temporary"
@@ -1581,7 +1802,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": "6277191135259896685"
+                    "nonce": "5806905060045992000"
                   }
                 },
                 "durability": "temporary",
@@ -1626,6 +1847,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/cancel_already_cancelled_reverts.1.json b/contracts/events/test_snapshots/tests/cross_contract/cancel_already_cancelled_reverts.1.json
index 01e3257..e68a0c6 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/cancel_already_cancelled_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/cancel_already_cancelled_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "93930f22a9c78c5a0151d55a24666caf22cb29af64b33bd91099b7792892389d"
+                  "bytes": "8e49df60a100c6886ba66078699dc45e3e77e0bc858882ae3eddcef632c6016d"
                 }
               ]
             }
@@ -266,7 +266,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "1ef67c440ee8f498f8a41dd23dc69d8e825b327b4cc3d70b6ae438e815294ce5"
+                  "bytes": "a9293521c51ac970e9e1f62ce99a29851dd1fd1e6f7d273041c4ef44b9201306"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1ef67c440ee8f498f8a41dd23dc69d8e825b327b4cc3d70b6ae438e815294ce5"
+                  "bytes": "8e49df60a100c6886ba66078699dc45e3e77e0bc858882ae3eddcef632c6016d"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1ef67c440ee8f498f8a41dd23dc69d8e825b327b4cc3d70b6ae438e815294ce5"
+                      "bytes": "8e49df60a100c6886ba66078699dc45e3e77e0bc858882ae3eddcef632c6016d"
                     }
                   ]
                 },
@@ -740,7 +740,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "93930f22a9c78c5a0151d55a24666caf22cb29af64b33bd91099b7792892389d"
+                  "bytes": "a9293521c51ac970e9e1f62ce99a29851dd1fd1e6f7d273041c4ef44b9201306"
                 }
               ]
             },
@@ -760,7 +760,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "93930f22a9c78c5a0151d55a24666caf22cb29af64b33bd91099b7792892389d"
+                      "bytes": "a9293521c51ac970e9e1f62ce99a29851dd1fd1e6f7d273041c4ef44b9201306"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/cancel_refunds_remaining_escrow_to_owner.1.json b/contracts/events/test_snapshots/tests/cross_contract/cancel_refunds_remaining_escrow_to_owner.1.json
index 55e7758..6dc1225 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/cancel_refunds_remaining_escrow_to_owner.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/cancel_refunds_remaining_escrow_to_owner.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "3490aa2b3f6845ff396c9ad844579092e368c0c7f899ff4000a297c8c897cb32"
+                  "bytes": "e860e379bdc3ec8c960fcd6038fe475aa9d29b62e272568189cc464e87eb007a"
                 }
               ]
             }
@@ -267,7 +267,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "a6c1960d0b9ec2f997e019600e9cc419f694536d9716bfe79a531e7be02cdd9c"
+                  "bytes": "2f715ad8fe02e23abbb608ee3eb85ee4ed5146e8aec101da4871abb4a33a384a"
                 }
               ]
             }
@@ -697,7 +697,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3490aa2b3f6845ff396c9ad844579092e368c0c7f899ff4000a297c8c897cb32"
+                  "bytes": "2f715ad8fe02e23abbb608ee3eb85ee4ed5146e8aec101da4871abb4a33a384a"
                 }
               ]
             },
@@ -717,7 +717,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3490aa2b3f6845ff396c9ad844579092e368c0c7f899ff4000a297c8c897cb32"
+                      "bytes": "2f715ad8fe02e23abbb608ee3eb85ee4ed5146e8aec101da4871abb4a33a384a"
                     }
                   ]
                 },
@@ -742,7 +742,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a6c1960d0b9ec2f997e019600e9cc419f694536d9716bfe79a531e7be02cdd9c"
+                  "bytes": "e860e379bdc3ec8c960fcd6038fe475aa9d29b62e272568189cc464e87eb007a"
                 }
               ]
             },
@@ -762,7 +762,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a6c1960d0b9ec2f997e019600e9cc419f694536d9716bfe79a531e7be02cdd9c"
+                      "bytes": "e860e379bdc3ec8c960fcd6038fe475aa9d29b62e272568189cc464e87eb007a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_final_milestone_marks_event_completed.1.json b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_final_milestone_marks_event_completed.1.json
index 6c20bac..d538354 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_final_milestone_marks_event_completed.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_final_milestone_marks_event_completed.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "ae379c50bdde58329056fbc8590d7283f4c14f19db17a94a5f725ab4d1c720e3"
+                  "bytes": "8deb851802b59ee8b58dbca08894e64922f0f613e3d355caa362bee64a6c123d"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "22cf4087f3b6b83fc256b290b7857a9983e922a7dc3f1915134e44846e91abb9"
+                  "bytes": "be551157274282f3a9a05ae6ff8f6b8bdd279c52ddc3e5863112f7c9ef13ebca"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "ca5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                  "bytes": "ae746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                 }
               ]
             }
@@ -364,7 +364,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "ed25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                  "bytes": "82dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                 }
               ]
             }
@@ -540,7 +540,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0c25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                  "bytes": "1e746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                 }
               ]
             },
@@ -560,7 +560,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0c25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                      "bytes": "1e746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                     }
                   ]
                 },
@@ -585,7 +585,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1b5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                  "bytes": "32dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                 }
               ]
             },
@@ -605,7 +605,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1b5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                      "bytes": "32dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                     }
                   ]
                 },
@@ -630,7 +630,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2b5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                  "bytes": "4f746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                 }
               ]
             },
@@ -650,7 +650,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2b5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                      "bytes": "4f746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                     }
                   ]
                 },
@@ -675,7 +675,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3c25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                  "bytes": "53dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                 }
               ]
             },
@@ -695,7 +695,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3c25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                      "bytes": "53dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                     }
                   ]
                 },
@@ -720,7 +720,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5d25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                  "bytes": "63dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                 }
               ]
             },
@@ -740,7 +740,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5d25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                      "bytes": "63dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                     }
                   ]
                 },
@@ -765,7 +765,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7a5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                  "bytes": "7f746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                 }
               ]
             },
@@ -785,7 +785,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7a5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                      "bytes": "7f746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                     }
                   ]
                 },
@@ -1609,7 +1609,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "22cf4087f3b6b83fc256b290b7857a9983e922a7dc3f1915134e44846e91abb9"
+                  "bytes": "82dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                 }
               ]
             },
@@ -1629,7 +1629,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "22cf4087f3b6b83fc256b290b7857a9983e922a7dc3f1915134e44846e91abb9"
+                      "bytes": "82dcbf03b3021c28d0116b9257f27eae7ed59f5135490f962a6211802c2fc806"
                     }
                   ]
                 },
@@ -1654,7 +1654,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ae379c50bdde58329056fbc8590d7283f4c14f19db17a94a5f725ab4d1c720e3"
+                  "bytes": "8deb851802b59ee8b58dbca08894e64922f0f613e3d355caa362bee64a6c123d"
                 }
               ]
             },
@@ -1674,7 +1674,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ae379c50bdde58329056fbc8590d7283f4c14f19db17a94a5f725ab4d1c720e3"
+                      "bytes": "8deb851802b59ee8b58dbca08894e64922f0f613e3d355caa362bee64a6c123d"
                     }
                   ]
                 },
@@ -1699,7 +1699,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ca5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                  "bytes": "ae746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                 }
               ]
             },
@@ -1719,7 +1719,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ca5585fd0b7d81d9880f973f8027cb6441b59777e178ab444fa29e2d899c4bf2"
+                      "bytes": "ae746ef9f0a2054b6f9a42f445cf2299ce70905bcbfa6f651163b59f670aa839"
                     }
                   ]
                 },
@@ -1744,7 +1744,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ed25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                  "bytes": "be551157274282f3a9a05ae6ff8f6b8bdd279c52ddc3e5863112f7c9ef13ebca"
                 }
               ]
             },
@@ -1764,7 +1764,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ed25dc452eebab05063ce2616fafa54d149a2e52c5cb19171db6a6856e63bca5"
+                      "bytes": "be551157274282f3a9a05ae6ff8f6b8bdd279c52ddc3e5863112f7c9ef13ebca"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_idempotent_per_recipient_and_milestone.1.json b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_idempotent_per_recipient_and_milestone.1.json
index a191ab3..4a8922a 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_idempotent_per_recipient_and_milestone.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_idempotent_per_recipient_and_milestone.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "5b815c99d0af31218b0220e37c9012b2122a2ce1fb9d693b46a69768bb40256e"
+                  "bytes": "1c4d2085284cbf558e0fad2dbd5684c51a9da8d836aa88660e45a5ec5655da57"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "7b794a61da97b73930c4c42717bd28f3154b232ae2cdf6583be72e8fdfdbf553"
+                  "bytes": "616c6703dcf7764f9690aeebba98ef08893e48cedcf088542ab609659114832f"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "c19ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                  "bytes": "2ff7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                 }
               ]
             }
@@ -364,7 +364,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "48cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                  "bytes": "8dcbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                 }
               ]
             }
@@ -539,7 +539,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "109ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                  "bytes": "3dcbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                 }
               ]
             },
@@ -559,7 +559,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "109ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                      "bytes": "3dcbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                     }
                   ]
                 },
@@ -584,7 +584,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "209ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                  "bytes": "5ccbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                 }
               ]
             },
@@ -604,7 +604,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "209ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                      "bytes": "5ccbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                     }
                   ]
                 },
@@ -629,7 +629,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "719ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                  "bytes": "6ccbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                 }
               ]
             },
@@ -649,7 +649,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "719ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                      "bytes": "6ccbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                     }
                   ]
                 },
@@ -674,7 +674,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "99cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                  "bytes": "9ff7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                 }
               ]
             },
@@ -694,7 +694,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "99cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                      "bytes": "9ff7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                     }
                   ]
                 },
@@ -719,7 +719,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a9cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                  "bytes": "cef7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                 }
               ]
             },
@@ -739,7 +739,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a9cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                      "bytes": "cef7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                     }
                   ]
                 },
@@ -764,7 +764,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f8cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                  "bytes": "fef7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                 }
               ]
             },
@@ -784,7 +784,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f8cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                      "bytes": "fef7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                     }
                   ]
                 },
@@ -1608,7 +1608,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "48cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                  "bytes": "1c4d2085284cbf558e0fad2dbd5684c51a9da8d836aa88660e45a5ec5655da57"
                 }
               ]
             },
@@ -1628,7 +1628,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "48cf21b3846dede18ba2bff6da0c6b97f0424a3b82e04e9a35b2a2906fda59e5"
+                      "bytes": "1c4d2085284cbf558e0fad2dbd5684c51a9da8d836aa88660e45a5ec5655da57"
                     }
                   ]
                 },
@@ -1653,7 +1653,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5b815c99d0af31218b0220e37c9012b2122a2ce1fb9d693b46a69768bb40256e"
+                  "bytes": "2ff7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                 }
               ]
             },
@@ -1673,7 +1673,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5b815c99d0af31218b0220e37c9012b2122a2ce1fb9d693b46a69768bb40256e"
+                      "bytes": "2ff7db8fe39e3d197360cfd1e089461a06550d50f5cf2ec4c2ee6012e960b19c"
                     }
                   ]
                 },
@@ -1698,7 +1698,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7b794a61da97b73930c4c42717bd28f3154b232ae2cdf6583be72e8fdfdbf553"
+                  "bytes": "616c6703dcf7764f9690aeebba98ef08893e48cedcf088542ab609659114832f"
                 }
               ]
             },
@@ -1718,7 +1718,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7b794a61da97b73930c4c42717bd28f3154b232ae2cdf6583be72e8fdfdbf553"
+                      "bytes": "616c6703dcf7764f9690aeebba98ef08893e48cedcf088542ab609659114832f"
                     }
                   ]
                 },
@@ -1743,7 +1743,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c19ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                  "bytes": "8dcbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                 }
               ]
             },
@@ -1763,7 +1763,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c19ef295fbf3dde7e73a426ac5f970f7efa7a3ea688a1686347126fe55a2155c"
+                      "bytes": "8dcbdeea85d221211af1c7af5f6c5fbc0daae76bc7f65a00f64f6154ff0c3632"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_invalid_milestone_index_reverts.1.json b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_invalid_milestone_index_reverts.1.json
index 0c502ff..db84285 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_invalid_milestone_index_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_invalid_milestone_index_reverts.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "838ab07163bbb640121c5eb674affa0d75e0f93639606706c5a69d22c29ed690"
+                  "bytes": "f545a8929eb13beca04a93ec829bf1025539cd46141ffb793e55c17da560b255"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "164f2f6f11fd45a7dbdeb9786b9b4ec4bae9890721b7a93279309749cbfa14bf"
+                  "bytes": "30be103edae0c1088cf0dc8e725075896e72d57bde9005922c0045da1defc2e3"
                 }
               ]
             }
@@ -865,7 +865,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "164f2f6f11fd45a7dbdeb9786b9b4ec4bae9890721b7a93279309749cbfa14bf"
+                  "bytes": "30be103edae0c1088cf0dc8e725075896e72d57bde9005922c0045da1defc2e3"
                 }
               ]
             },
@@ -885,7 +885,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "164f2f6f11fd45a7dbdeb9786b9b4ec4bae9890721b7a93279309749cbfa14bf"
+                      "bytes": "30be103edae0c1088cf0dc8e725075896e72d57bde9005922c0045da1defc2e3"
                     }
                   ]
                 },
@@ -910,7 +910,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "838ab07163bbb640121c5eb674affa0d75e0f93639606706c5a69d22c29ed690"
+                  "bytes": "f545a8929eb13beca04a93ec829bf1025539cd46141ffb793e55c17da560b255"
                 }
               ]
             },
@@ -930,7 +930,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "838ab07163bbb640121c5eb674affa0d75e0f93639606706c5a69d22c29ed690"
+                      "bytes": "f545a8929eb13beca04a93ec829bf1025539cd46141ffb793e55c17da560b255"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_pays_per_milestone_amount.1.json b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_pays_per_milestone_amount.1.json
index 648b740..62dcce9 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_pays_per_milestone_amount.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_pays_per_milestone_amount.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "8beb07d5a8935f2fedfba676c3f092334adfc3f82f2221a3661b2f8d0e0089bf"
+                  "bytes": "5fb6093fe431f893f4e1997ae407886083ea0873283ba5de748f8398debfa7fa"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "58dd633bc2f69bbb8043862eef1b3c4a4a2109634828bee1b309dfae1a00c585"
+                  "bytes": "7e78b15dfa986d1b103a392fdbc823f0ef920d044a150dd73676e39482044b4b"
                 }
               ]
             }
@@ -333,7 +333,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "3c6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                  "bytes": "5587900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                 }
               ]
             }
@@ -512,7 +512,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8c6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                  "bytes": "8487900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                 }
               ]
             },
@@ -532,7 +532,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8c6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                      "bytes": "8487900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                     }
                   ]
                 },
@@ -557,7 +557,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dd6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                  "bytes": "b487900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                 }
               ]
             },
@@ -577,7 +577,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dd6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                      "bytes": "b487900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                     }
                   ]
                 },
@@ -602,7 +602,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ed6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                  "bytes": "e587900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                 }
               ]
             },
@@ -622,7 +622,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ed6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                      "bytes": "e587900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                     }
                   ]
                 },
@@ -1297,7 +1297,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3c6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                  "bytes": "5587900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                 }
               ]
             },
@@ -1317,7 +1317,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3c6a3856a35e254e258f5fe303d3444376fd838ed38fcadb5b5cb72e256f8293"
+                      "bytes": "5587900af96302043120193468e3c3e37f6a70af0e5f51b3be9032a9d4dedba7"
                     }
                   ]
                 },
@@ -1342,7 +1342,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "58dd633bc2f69bbb8043862eef1b3c4a4a2109634828bee1b309dfae1a00c585"
+                  "bytes": "5fb6093fe431f893f4e1997ae407886083ea0873283ba5de748f8398debfa7fa"
                 }
               ]
             },
@@ -1362,7 +1362,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "58dd633bc2f69bbb8043862eef1b3c4a4a2109634828bee1b309dfae1a00c585"
+                      "bytes": "5fb6093fe431f893f4e1997ae407886083ea0873283ba5de748f8398debfa7fa"
                     }
                   ]
                 },
@@ -1387,7 +1387,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8beb07d5a8935f2fedfba676c3f092334adfc3f82f2221a3661b2f8d0e0089bf"
+                  "bytes": "7e78b15dfa986d1b103a392fdbc823f0ef920d044a150dd73676e39482044b4b"
                 }
               ]
             },
@@ -1407,7 +1407,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8beb07d5a8935f2fedfba676c3f092334adfc3f82f2221a3661b2f8d0e0089bf"
+                      "bytes": "7e78b15dfa986d1b103a392fdbc823f0ef920d044a150dd73676e39482044b4b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_rejects_non_grant_events.1.json b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_rejects_non_grant_events.1.json
index 5fa6b5f..cab6d6d 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_rejects_non_grant_events.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/claim_milestone_rejects_non_grant_events.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "7cf3bbcef110db345d57ec941aa93002efc6278c1c999dbb728afe934b683c78"
+                  "bytes": "4a7e6d580238895b2afdd7070afbb2a6e520dbce29442caadd90700fe9b8032c"
                 }
               ]
             }
@@ -298,7 +298,7 @@
                   ]
                 },
                 {
-                  "bytes": "3a4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
+                  "bytes": "d2a44b4b49782056fc619c02527ef179715b70fe9319d377dccbb3b48eb6460c"
                 }
               ]
             }
@@ -422,7 +422,7 @@
                   ]
                 },
                 {
-                  "bytes": "7618fff7554bcedf004d86e7efda8a95e3288ab44449b3efdd0bb2e31c87b6fd"
+                  "bytes": "2d7188aec2d3bd7e6e0c4e5e1a7188e3fc6444b8b3c37b08e14effeb106cee66"
                 }
               ]
             }
@@ -558,254 +558,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "100000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "8a4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "8a4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "db4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "db4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "eb4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "eb4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -1044,7 +796,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -1054,7 +806,7 @@
                       "val": {
                         "vec": [
                           {
-                            "symbol": "Completed"
+                            "symbol": "Active"
                           }
                         ]
                       }
@@ -1347,9 +1099,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1431,7 +1181,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3a4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
+                  "bytes": "2d7188aec2d3bd7e6e0c4e5e1a7188e3fc6444b8b3c37b08e14effeb106cee66"
                 }
               ]
             },
@@ -1451,7 +1201,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3a4d64d6a83d3fde6ae19328bc492d424c878fe2d963a4ae71720ff587781180"
+                      "bytes": "2d7188aec2d3bd7e6e0c4e5e1a7188e3fc6444b8b3c37b08e14effeb106cee66"
                     }
                   ]
                 },
@@ -1476,7 +1226,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7618fff7554bcedf004d86e7efda8a95e3288ab44449b3efdd0bb2e31c87b6fd"
+                  "bytes": "4a7e6d580238895b2afdd7070afbb2a6e520dbce29442caadd90700fe9b8032c"
                 }
               ]
             },
@@ -1496,7 +1246,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7618fff7554bcedf004d86e7efda8a95e3288ab44449b3efdd0bb2e31c87b6fd"
+                      "bytes": "4a7e6d580238895b2afdd7070afbb2a6e520dbce29442caadd90700fe9b8032c"
                     }
                   ]
                 },
@@ -1521,7 +1271,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7cf3bbcef110db345d57ec941aa93002efc6278c1c999dbb728afe934b683c78"
+                  "bytes": "d2a44b4b49782056fc619c02527ef179715b70fe9319d377dccbb3b48eb6460c"
                 }
               ]
             },
@@ -1541,7 +1291,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7cf3bbcef110db345d57ec941aa93002efc6278c1c999dbb728afe934b683c78"
+                      "bytes": "d2a44b4b49782056fc619c02527ef179715b70fe9319d377dccbb3b48eb6460c"
                     }
                   ]
                 },
@@ -2019,7 +1769,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "100000000000"
+                        "i128": "200000000000"
                       }
                     },
                     {
@@ -2117,76 +1867,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "100000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/create_event_charges_override_rate_when_provided.1.json b/contracts/events/test_snapshots/tests/cross_contract/create_event_charges_override_rate_when_provided.1.json
index 169bca1..3706375 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/create_event_charges_override_rate_when_provided.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/create_event_charges_override_rate_when_provided.1.json
@@ -227,7 +227,7 @@
                   ]
                 },
                 {
-                  "bytes": "a59d7e7862cb157063d387ccf6652ce0d5c97e1af21a0897123eb57534722d9d"
+                  "bytes": "8e5fd6986ef3e2e9f30eeb18bc1083dfdc5687971718c7048affa885c3276625"
                 }
               ]
             }
@@ -680,7 +680,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a59d7e7862cb157063d387ccf6652ce0d5c97e1af21a0897123eb57534722d9d"
+                  "bytes": "8e5fd6986ef3e2e9f30eeb18bc1083dfdc5687971718c7048affa885c3276625"
                 }
               ]
             },
@@ -700,7 +700,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a59d7e7862cb157063d387ccf6652ce0d5c97e1af21a0897123eb57534722d9d"
+                      "bytes": "8e5fd6986ef3e2e9f30eeb18bc1083dfdc5687971718c7048affa885c3276625"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/create_event_omitted_override_falls_back_to_global_default.1.json b/contracts/events/test_snapshots/tests/cross_contract/create_event_omitted_override_falls_back_to_global_default.1.json
index 40d3b6e..8e7b444 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/create_event_omitted_override_falls_back_to_global_default.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/create_event_omitted_override_falls_back_to_global_default.1.json
@@ -224,7 +224,7 @@
                   ]
                 },
                 {
-                  "bytes": "05f82f0a6ab68e9d281062b7ab15ffb3e2488d90bab45f9dee2deae26a660bf1"
+                  "bytes": "f337abd2bd82759b02eb09e6d43c9da4f7e4305a8c8ef69a59a8981cc6e9d4a6"
                 }
               ]
             }
@@ -674,7 +674,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "05f82f0a6ab68e9d281062b7ab15ffb3e2488d90bab45f9dee2deae26a660bf1"
+                  "bytes": "f337abd2bd82759b02eb09e6d43c9da4f7e4305a8c8ef69a59a8981cc6e9d4a6"
                 }
               ]
             },
@@ -694,7 +694,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "05f82f0a6ab68e9d281062b7ab15ffb3e2488d90bab45f9dee2deae26a660bf1"
+                      "bytes": "f337abd2bd82759b02eb09e6d43c9da4f7e4305a8c8ef69a59a8981cc6e9d4a6"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/create_event_with_waiver_charges_no_fee.1.json b/contracts/events/test_snapshots/tests/cross_contract/create_event_with_waiver_charges_no_fee.1.json
index 960ede0..0d5e025 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/create_event_with_waiver_charges_no_fee.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/create_event_with_waiver_charges_no_fee.1.json
@@ -227,7 +227,7 @@
                   ]
                 },
                 {
-                  "bytes": "c3d1220ec6ea5217e0c160cbcbf68774f9f647bc86db921a60dc6ee7bcfdcc7d"
+                  "bytes": "f230b8dabc7b40eb7ec3a482d10236550cdbb0fe3abaa25332e1ee03382e9a11"
                 }
               ]
             }
@@ -679,7 +679,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c3d1220ec6ea5217e0c160cbcbf68774f9f647bc86db921a60dc6ee7bcfdcc7d"
+                  "bytes": "f230b8dabc7b40eb7ec3a482d10236550cdbb0fe3abaa25332e1ee03382e9a11"
                 }
               ]
             },
@@ -699,7 +699,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c3d1220ec6ea5217e0c160cbcbf68774f9f647bc86db921a60dc6ee7bcfdcc7d"
+                      "bytes": "f230b8dabc7b40eb7ec3a482d10236550cdbb0fe3abaa25332e1ee03382e9a11"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/grant_last_milestone_sweeps_rounding_residue.1.json b/contracts/events/test_snapshots/tests/cross_contract/grant_last_milestone_sweeps_rounding_residue.1.json
index 1a55632..7bc26d4 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/grant_last_milestone_sweeps_rounding_residue.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/grant_last_milestone_sweeps_rounding_residue.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "80f91884c1997e738f556dad0f0db5a88af1537595a011f38e7c650570d33cdf"
+                  "bytes": "4ad8cb7c3fc0bb0c05db51eb5992cb492eb812c0d879f28bbe1069ae7583a111"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "cdbcfbe8b013ec3ca4433e239ac6870c06e91d060631d511f8fd08130e257bfc"
+                  "bytes": "e670b9f2f52f4db9d1c126ddf392d676c6742434e0440f82550e05320e1dbe3b"
                 }
               ]
             }
@@ -333,7 +333,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "48923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                  "bytes": "be47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                 }
               ]
             }
@@ -364,7 +364,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "325e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                  "bytes": "9f1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                 }
               ]
             }
@@ -396,7 +396,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "7a6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                  "bytes": "2b63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                 }
               ]
             }
@@ -573,7 +573,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "825e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                  "bytes": "0e47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                 }
               ]
             },
@@ -593,7 +593,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "825e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                      "bytes": "0e47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                     }
                   ]
                 },
@@ -618,7 +618,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "99923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                  "bytes": "2f1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                 }
               ]
             },
@@ -638,7 +638,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "99923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                      "bytes": "2f1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                     }
                   ]
                 },
@@ -663,7 +663,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9b6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                  "bytes": "4e1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                 }
               ]
             },
@@ -683,7 +683,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9b6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                      "bytes": "4e1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                     }
                   ]
                 },
@@ -708,7 +708,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a9923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                  "bytes": "5f47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                 }
               ]
             },
@@ -728,7 +728,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a9923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                      "bytes": "5f47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                     }
                   ]
                 },
@@ -753,7 +753,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ab6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                  "bytes": "6f47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                 }
               ]
             },
@@ -773,7 +773,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ab6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                      "bytes": "6f47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                     }
                   ]
                 },
@@ -798,7 +798,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ca6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                  "bytes": "7e1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                 }
               ]
             },
@@ -818,7 +818,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ca6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                      "bytes": "7e1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                     }
                   ]
                 },
@@ -843,7 +843,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d35e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                  "bytes": "9b63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                 }
               ]
             },
@@ -863,7 +863,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d35e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                      "bytes": "9b63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                     }
                   ]
                 },
@@ -888,7 +888,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e35e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                  "bytes": "ca63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                 }
               ]
             },
@@ -908,7 +908,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e35e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                      "bytes": "ca63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                     }
                   ]
                 },
@@ -933,7 +933,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f8923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                  "bytes": "fa63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                 }
               ]
             },
@@ -953,7 +953,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f8923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                      "bytes": "fa63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                     }
                   ]
                 },
@@ -1926,7 +1926,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "325e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                  "bytes": "2b63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                 }
               ]
             },
@@ -1946,7 +1946,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "325e6798c4f6bb0a2f84adcc8eca17a9f00b954484b0d779e84de27d14a85aba"
+                      "bytes": "2b63bb9ab9e006250f9649f2bb8dd148b374bdb3fbf9b37e030e17d77ff95e26"
                     }
                   ]
                 },
@@ -1971,7 +1971,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "48923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                  "bytes": "4ad8cb7c3fc0bb0c05db51eb5992cb492eb812c0d879f28bbe1069ae7583a111"
                 }
               ]
             },
@@ -1991,7 +1991,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "48923752042161c2944804ae691deec6c7e41815416df428f9b394de5aa85fa8"
+                      "bytes": "4ad8cb7c3fc0bb0c05db51eb5992cb492eb812c0d879f28bbe1069ae7583a111"
                     }
                   ]
                 },
@@ -2016,7 +2016,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7a6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                  "bytes": "9f1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                 }
               ]
             },
@@ -2036,7 +2036,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7a6a937dfcf798fefd9623fced224f9c8965893a9fe34f87f04da1ae90cfc942"
+                      "bytes": "9f1cc1891032c9af912eb125f106863ecbc791971d1e6febd3785adabf3d8511"
                     }
                   ]
                 },
@@ -2061,7 +2061,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "80f91884c1997e738f556dad0f0db5a88af1537595a011f38e7c650570d33cdf"
+                  "bytes": "be47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                 }
               ]
             },
@@ -2081,7 +2081,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "80f91884c1997e738f556dad0f0db5a88af1537595a011f38e7c650570d33cdf"
+                      "bytes": "be47aeadc4defb4d6f0bba317720507068b7bcbfb8ead7e64027a972fda4a1fe"
                     }
                   ]
                 },
@@ -2106,7 +2106,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cdbcfbe8b013ec3ca4433e239ac6870c06e91d060631d511f8fd08130e257bfc"
+                  "bytes": "e670b9f2f52f4db9d1c126ddf392d676c6742434e0440f82550e05320e1dbe3b"
                 }
               ]
             },
@@ -2126,7 +2126,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cdbcfbe8b013ec3ca4433e239ac6870c06e91d060631d511f8fd08130e257bfc"
+                      "bytes": "e670b9f2f52f4db9d1c126ddf392d676c6742434e0440f82550e05320e1dbe3b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/hackathon_submit_creates_anchor_without_prior_apply.1.json b/contracts/events/test_snapshots/tests/cross_contract/hackathon_submit_creates_anchor_without_prior_apply.1.json
index 3c64efe..89561e9 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/hackathon_submit_creates_anchor_without_prior_apply.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/hackathon_submit_creates_anchor_without_prior_apply.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "4090ee222b0077fdcf486a72f129d30c10b4a93c37960f60505a231d661746b5"
+                  "bytes": "9ad6033218198a686c0a94f274e5c66745478728bea402d27f9412158e316136"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../project.json"
                 },
                 {
-                  "bytes": "1a16a7313302e349f2ef853bf10f76a2724b394045a1ec1c9e7080b70916cfc6"
+                  "bytes": "9dfdfab7113e9c041456e7e0da086e98b234f8eadbf62ec293888ad6ec9934ff"
                 }
               ]
             }
@@ -776,7 +776,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1a16a7313302e349f2ef853bf10f76a2724b394045a1ec1c9e7080b70916cfc6"
+                  "bytes": "9ad6033218198a686c0a94f274e5c66745478728bea402d27f9412158e316136"
                 }
               ]
             },
@@ -796,7 +796,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1a16a7313302e349f2ef853bf10f76a2724b394045a1ec1c9e7080b70916cfc6"
+                      "bytes": "9ad6033218198a686c0a94f274e5c66745478728bea402d27f9412158e316136"
                     }
                   ]
                 },
@@ -821,7 +821,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4090ee222b0077fdcf486a72f129d30c10b4a93c37960f60505a231d661746b5"
+                  "bytes": "9dfdfab7113e9c041456e7e0da086e98b234f8eadbf62ec293888ad6ec9934ff"
                 }
               ]
             },
@@ -841,7 +841,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4090ee222b0077fdcf486a72f129d30c10b4a93c37960f60505a231d661746b5"
+                      "bytes": "9dfdfab7113e9c041456e7e0da086e98b234f8eadbf62ec293888ad6ec9934ff"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/manager_can_be_rotated.1.json b/contracts/events/test_snapshots/tests/cross_contract/manager_can_be_rotated.1.json
index f8ea22d..1d7c1f3 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/manager_can_be_rotated.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/manager_can_be_rotated.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "afd72fc6b5775f4d03bd5e7b2a547745982606cf8aadc79a7bfa0ac824d8b489"
+                  "bytes": "9333d5ee173e09f84669cc507dbb20daf0b80551b89528703b35fb2928396e05"
                 }
               ]
             }
@@ -742,7 +742,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "afd72fc6b5775f4d03bd5e7b2a547745982606cf8aadc79a7bfa0ac824d8b489"
+                  "bytes": "9333d5ee173e09f84669cc507dbb20daf0b80551b89528703b35fb2928396e05"
                 }
               ]
             },
@@ -762,7 +762,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "afd72fc6b5775f4d03bd5e7b2a547745982606cf8aadc79a7bfa0ac824d8b489"
+                      "bytes": "9333d5ee173e09f84669cc507dbb20daf0b80551b89528703b35fb2928396e05"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/manager_defaults_to_owner_and_override_is_recorded.1.json b/contracts/events/test_snapshots/tests/cross_contract/manager_defaults_to_owner_and_override_is_recorded.1.json
index 6abbf84..7a79417 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/manager_defaults_to_owner_and_override_is_recorded.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/manager_defaults_to_owner_and_override_is_recorded.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "abba048b901f308d85ca916aedc210f2e1055e49265a202023fcbdfde69d39db"
+                  "bytes": "646af15a2632763983e09cb8df60651c4d029a6e10b43e56426b54393ecd769f"
                 }
               ]
             }
@@ -371,7 +371,7 @@
                   ]
                 },
                 {
-                  "bytes": "cdd4847f6daf1af4cc5bfba8a8dac2634d6f54be298c52ffa7e0b5137e4d3d3f"
+                  "bytes": "37a11685075332c72088f7415d90eb8a090cad0b78fad2561be71efe4b401972"
                 }
               ]
             }
@@ -1043,7 +1043,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "abba048b901f308d85ca916aedc210f2e1055e49265a202023fcbdfde69d39db"
+                  "bytes": "37a11685075332c72088f7415d90eb8a090cad0b78fad2561be71efe4b401972"
                 }
               ]
             },
@@ -1063,7 +1063,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "abba048b901f308d85ca916aedc210f2e1055e49265a202023fcbdfde69d39db"
+                      "bytes": "37a11685075332c72088f7415d90eb8a090cad0b78fad2561be71efe4b401972"
                     }
                   ]
                 },
@@ -1088,7 +1088,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cdd4847f6daf1af4cc5bfba8a8dac2634d6f54be298c52ffa7e0b5137e4d3d3f"
+                  "bytes": "646af15a2632763983e09cb8df60651c4d029a6e10b43e56426b54393ecd769f"
                 }
               ]
             },
@@ -1108,7 +1108,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cdd4847f6daf1af4cc5bfba8a8dac2634d6f54be298c52ffa7e0b5137e4d3d3f"
+                      "bytes": "646af15a2632763983e09cb8df60651c4d029a6e10b43e56426b54393ecd769f"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/manager_override_can_select_winners.1.json b/contracts/events/test_snapshots/tests/cross_contract/manager_override_can_select_winners.1.json
index 504f09b..0a538c7 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/manager_override_can_select_winners.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/manager_override_can_select_winners.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "c550196de16827fd81cdec678208b5dc5140157f08a368001acddbfe89cbe826"
+                  "bytes": "2d504cc979c9125631265660fdc985bd8b979e752a9f3cffa5c835bedd49d9de"
                 }
               ]
             }
@@ -271,7 +271,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "5ff8dd13bd1f28431a0807a3ae05a6c432a097082c2e399c0780c8d73a95ad6d"
+                  "bytes": "a68e1216b0e524922a2a5255af7c4d354c82a4ea0e15b77b15f52fcfcb04b960"
                 }
               ]
             }
@@ -325,7 +325,38 @@
                   ]
                 },
                 {
-                  "bytes": "2cb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                  "bytes": "8d7e2c4b7c0a5d6bcdce6315a8ec219d6660fa1baaa78e817e2f18d15e433ef2"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 0
+                },
+                {
+                  "bytes": "9237d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                 }
               ]
             }
@@ -501,7 +532,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9cb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                  "bytes": "168e1216b0e524922a2a5255af7c4d354c82a4ea0e15b77b15f52fcfcb04b960"
                 }
               ]
             },
@@ -521,7 +552,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9cb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                      "bytes": "168e1216b0e524922a2a5255af7c4d354c82a4ea0e15b77b15f52fcfcb04b960"
                     }
                   ]
                 },
@@ -546,7 +577,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cdb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                  "bytes": "2237d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                 }
               ]
             },
@@ -566,7 +597,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cdb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                      "bytes": "2237d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                     }
                   ]
                 },
@@ -591,7 +622,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "eff8dd13bd1f28431a0807a3ae05a6c432a097082c2e399c0780c8d73a95ad6d"
+                  "bytes": "4337d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                 }
               ]
             },
@@ -611,7 +642,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "eff8dd13bd1f28431a0807a3ae05a6c432a097082c2e399c0780c8d73a95ad6d"
+                      "bytes": "4337d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                     }
                   ]
                 },
@@ -636,7 +667,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "fdb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                  "bytes": "7337d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                 }
               ]
             },
@@ -656,7 +687,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "fdb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                      "bytes": "7337d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                     }
                   ]
                 },
@@ -1269,6 +1300,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "100000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1354,7 +1473,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1373,7 +1492,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2cb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                  "bytes": "2d504cc979c9125631265660fdc985bd8b979e752a9f3cffa5c835bedd49d9de"
                 }
               ]
             },
@@ -1393,7 +1512,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2cb3cd29d2ef284e538b528dbc60e7805f3d0285cc576993fda48bb10d2967da"
+                      "bytes": "2d504cc979c9125631265660fdc985bd8b979e752a9f3cffa5c835bedd49d9de"
                     }
                   ]
                 },
@@ -1418,7 +1537,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5ff8dd13bd1f28431a0807a3ae05a6c432a097082c2e399c0780c8d73a95ad6d"
+                  "bytes": "8d7e2c4b7c0a5d6bcdce6315a8ec219d6660fa1baaa78e817e2f18d15e433ef2"
                 }
               ]
             },
@@ -1438,7 +1557,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5ff8dd13bd1f28431a0807a3ae05a6c432a097082c2e399c0780c8d73a95ad6d"
+                      "bytes": "8d7e2c4b7c0a5d6bcdce6315a8ec219d6660fa1baaa78e817e2f18d15e433ef2"
                     }
                   ]
                 },
@@ -1463,7 +1582,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c550196de16827fd81cdec678208b5dc5140157f08a368001acddbfe89cbe826"
+                  "bytes": "9237d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                 }
               ]
             },
@@ -1483,7 +1602,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c550196de16827fd81cdec678208b5dc5140157f08a368001acddbfe89cbe826"
+                      "bytes": "9237d03d723a8dd81cfded198c889a70c6d024393fc837a8e23c724337167827"
                     }
                   ]
                 },
@@ -1498,6 +1617,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "a68e1216b0e524922a2a5255af7c4d354c82a4ea0e15b77b15f52fcfcb04b960"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "a68e1216b0e524922a2a5255af7c4d354c82a4ea0e15b77b15f52fcfcb04b960"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1783,6 +2004,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/resubmit_preserves_original_submitted_at_and_updates_uri.1.json b/contracts/events/test_snapshots/tests/cross_contract/resubmit_preserves_original_submitted_at_and_updates_uri.1.json
index b5d656f..b202ba5 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/resubmit_preserves_original_submitted_at_and_updates_uri.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/resubmit_preserves_original_submitted_at_and_updates_uri.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "835a618f9ef19005e8904b2f7612d0301932cc4eb352e642534f185bdf82e3c9"
+                  "bytes": "dc31660640d5724a27f12e77f8dc077d7e767b88be61f1d0a3dee084095454e5"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../v1.json"
                 },
                 {
-                  "bytes": "887d92bff9b0cb7e0b248722b5836f7016bcb0430aed3c72f8ed2371e1c26dbc"
+                  "bytes": "b2bc0dc78d3f91f9d0c8d3147adbb14fe79d70d2bdbfbafa4827d07f40c81b44"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   "string": "ipfs://Qm.../v2.json"
                 },
                 {
-                  "bytes": "225c64aa0e0c6151b2a32e28f0d4b41512dba88bd641a693ae786c0eb6261060"
+                  "bytes": "fe8dc6cdadd73b5c834c3aaa5ceabf833164ec0c2aa7ea6cf053d49ca92dea7b"
                 }
               ]
             }
@@ -805,7 +805,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "225c64aa0e0c6151b2a32e28f0d4b41512dba88bd641a693ae786c0eb6261060"
+                  "bytes": "b2bc0dc78d3f91f9d0c8d3147adbb14fe79d70d2bdbfbafa4827d07f40c81b44"
                 }
               ]
             },
@@ -825,7 +825,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "225c64aa0e0c6151b2a32e28f0d4b41512dba88bd641a693ae786c0eb6261060"
+                      "bytes": "b2bc0dc78d3f91f9d0c8d3147adbb14fe79d70d2bdbfbafa4827d07f40c81b44"
                     }
                   ]
                 },
@@ -850,7 +850,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "835a618f9ef19005e8904b2f7612d0301932cc4eb352e642534f185bdf82e3c9"
+                  "bytes": "dc31660640d5724a27f12e77f8dc077d7e767b88be61f1d0a3dee084095454e5"
                 }
               ]
             },
@@ -870,7 +870,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "835a618f9ef19005e8904b2f7612d0301932cc4eb352e642534f185bdf82e3c9"
+                      "bytes": "dc31660640d5724a27f12e77f8dc077d7e767b88be61f1d0a3dee084095454e5"
                     }
                   ]
                 },
@@ -895,7 +895,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "887d92bff9b0cb7e0b248722b5836f7016bcb0430aed3c72f8ed2371e1c26dbc"
+                  "bytes": "fe8dc6cdadd73b5c834c3aaa5ceabf833164ec0c2aa7ea6cf053d49ca92dea7b"
                 }
               ]
             },
@@ -915,7 +915,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "887d92bff9b0cb7e0b248722b5836f7016bcb0430aed3c72f8ed2371e1c26dbc"
+                      "bytes": "fe8dc6cdadd73b5c834c3aaa5ceabf833164ec0c2aa7ea6cf053d49ca92dea7b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_handles_multi_recipient_distribution.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_handles_multi_recipient_distribution.1.json
index cbf9074..3d7f503 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_handles_multi_recipient_distribution.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_handles_multi_recipient_distribution.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "879192fb320a33fae7baa7621dbc9d4ac703152cb8cf337fea90bfa7259ada53"
+                  "bytes": "f427aecb2748684f7cb34a8c87091f8dc9293bfe07d08e0c3875fd0300d8eb1c"
                 }
               ]
             }
@@ -334,7 +334,69 @@
                   ]
                 },
                 {
-                  "bytes": "b90a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "d9d8302788912a99057a64ed755dcdbbd24a282e8b9b8003e174304ad30fd11d"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "2c6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 2
+                },
+                {
+                  "u32": 25
+                },
+                {
+                  "bytes": "40b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                 }
               ]
             }
@@ -565,7 +627,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "090a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "91b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                 }
               ]
             },
@@ -585,7 +647,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "090a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "91b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                     }
                   ]
                 },
@@ -610,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "090b45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "9c6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                 }
               ]
             },
@@ -630,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "090b45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "9c6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                     }
                   ]
                 },
@@ -655,7 +717,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "580a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "a1b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                 }
               ]
             },
@@ -675,7 +737,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "580a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "a1b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                     }
                   ]
                 },
@@ -700,7 +762,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "580b45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "cd6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                 }
               ]
             },
@@ -720,7 +782,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "580b45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "cd6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                     }
                   ]
                 },
@@ -745,7 +807,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "680a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "f0b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                 }
               ]
             },
@@ -765,7 +827,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "680a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "f0b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                     }
                   ]
                 },
@@ -790,7 +852,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "680b45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "fd6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                 }
               ]
             },
@@ -810,7 +872,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "680b45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "fd6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                     }
                   ]
                 },
@@ -1301,6 +1363,182 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "60000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "40000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 2
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 2
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 2
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1363,7 +1601,7 @@
                   "u64": "1"
                 },
                 {
-                  "u32": 1
+                  "u32": 3
                 }
               ]
             },
@@ -1386,7 +1624,7 @@
                       "u64": "1"
                     },
                     {
-                      "u32": 1
+                      "u32": 3
                     }
                   ]
                 },
@@ -1476,7 +1714,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 2
+                  "u32": 4
                 }
               }
             },
@@ -1495,7 +1733,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "879192fb320a33fae7baa7621dbc9d4ac703152cb8cf337fea90bfa7259ada53"
+                  "bytes": "2c6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                 }
               ]
             },
@@ -1515,7 +1753,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "879192fb320a33fae7baa7621dbc9d4ac703152cb8cf337fea90bfa7259ada53"
+                      "bytes": "2c6bc470efe5fbd25eb4a4935bc00499e6a30d1f919362363fd03aca66485815"
                     }
                   ]
                 },
@@ -1540,7 +1778,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b90a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                  "bytes": "40b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                 }
               ]
             },
@@ -1560,7 +1798,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b90a45068da28677835e92c9fff2f253e4eec248093959c808df1672570e8fee"
+                      "bytes": "40b904fc1f62c048a7b5ffa36dfacdf79e3efe2686e084731bd4b60ca834778e"
                     }
                   ]
                 },
@@ -1575,6 +1813,210 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "d9d8302788912a99057a64ed755dcdbbd24a282e8b9b8003e174304ad30fd11d"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "d9d8302788912a99057a64ed755dcdbbd24a282e8b9b8003e174304ad30fd11d"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "f427aecb2748684f7cb34a8c87091f8dc9293bfe07d08e0c3875fd0300d8eb1c"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "f427aecb2748684f7cb34a8c87091f8dc9293bfe07d08e0c3875fd0300d8eb1c"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 2
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                    },
+                    {
+                      "u32": 2
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1893,6 +2335,72 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_against_remaining_escrow_including_top_ups.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_against_remaining_escrow_including_top_ups.1.json
index 6951791..f52940e 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_against_remaining_escrow_including_top_ups.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_against_remaining_escrow_including_top_ups.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "6da6b19b7fe1825bdfc1a7878eff9506c56fab68846558ca423347c0d83098a7"
+                  "bytes": "fa0aaee0f91b3309e9e20cccd0e132a5c479aba229141200e177f4a9ea8ebe86"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "50000000000"
                 },
                 {
-                  "bytes": "1f44203cdb94992d22f82da79995d531d79825cfb8ff832596a6503a0ddd01a3"
+                  "bytes": "b0fad6886db58918f4c0fa3a243b7b8dccc27eda5ca03d6259cf022b38b78129"
                 }
               ]
             }
@@ -370,7 +370,38 @@
                   ]
                 },
                 {
-                  "bytes": "a34d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                  "bytes": "3b83163d5774a24191f1e1cb3a5ecca87c4473d3411f144a59af5f3ab98a9c1d"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "db9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                 }
               ]
             }
@@ -547,7 +578,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "134d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                  "bytes": "0a9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                 }
               ]
             },
@@ -567,7 +598,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "134d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                      "bytes": "0a9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                     }
                   ]
                 },
@@ -592,7 +623,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "424d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                  "bytes": "3a9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                 }
               ]
             },
@@ -612,7 +643,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "424d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                      "bytes": "3a9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                     }
                   ]
                 },
@@ -637,7 +668,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "724d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                  "bytes": "6b9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                 }
               ]
             },
@@ -657,7 +688,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "724d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                      "bytes": "6b9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                     }
                   ]
                 },
@@ -1276,6 +1307,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "150000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1361,7 +1480,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1380,7 +1499,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1f44203cdb94992d22f82da79995d531d79825cfb8ff832596a6503a0ddd01a3"
+                  "bytes": "3b83163d5774a24191f1e1cb3a5ecca87c4473d3411f144a59af5f3ab98a9c1d"
                 }
               ]
             },
@@ -1400,7 +1519,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1f44203cdb94992d22f82da79995d531d79825cfb8ff832596a6503a0ddd01a3"
+                      "bytes": "3b83163d5774a24191f1e1cb3a5ecca87c4473d3411f144a59af5f3ab98a9c1d"
                     }
                   ]
                 },
@@ -1425,7 +1544,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6da6b19b7fe1825bdfc1a7878eff9506c56fab68846558ca423347c0d83098a7"
+                  "bytes": "b0fad6886db58918f4c0fa3a243b7b8dccc27eda5ca03d6259cf022b38b78129"
                 }
               ]
             },
@@ -1445,7 +1564,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6da6b19b7fe1825bdfc1a7878eff9506c56fab68846558ca423347c0d83098a7"
+                      "bytes": "b0fad6886db58918f4c0fa3a243b7b8dccc27eda5ca03d6259cf022b38b78129"
                     }
                   ]
                 },
@@ -1470,7 +1589,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a34d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                  "bytes": "db9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                 }
               ]
             },
@@ -1490,7 +1609,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a34d9ae726c6cdc150e39408218b89b853ed7a6f0d0b2522222a65661cf41c6e"
+                      "bytes": "db9baf8c20da12a7c502ffd16dd840381de1e74dffa1eebab45bb90d8133fea1"
                     }
                   ]
                 },
@@ -1505,6 +1624,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "fa0aaee0f91b3309e9e20cccd0e132a5c479aba229141200e177f4a9ea8ebe86"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "fa0aaee0f91b3309e9e20cccd0e132a5c479aba229141200e177f4a9ea8ebe86"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1856,6 +2077,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "1194852393571756375"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "1194852393571756375"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_recipient_and_bumps_profile.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_recipient_and_bumps_profile.1.json
index fe616b4..243237c 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_recipient_and_bumps_profile.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_pays_recipient_and_bumps_profile.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "775b0c1ca526a04f071487b6f5a373669fd6b9a6e0dbbead03d45edd1a13a79d"
+                  "bytes": "bc429d5f8a16ebeaf34ec95d0cc31d0d31413ccc4786b4444caf080e190e8d31"
                 }
               ]
             }
@@ -269,7 +269,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "df03b5328890972f66678b7c8620f701711b441fdd108db3841963a537271467"
+                  "bytes": "7b813e5ea83f864c34ee570584765623cf820bc16e9f292d397361547d333995"
                 }
               ]
             }
@@ -323,7 +323,38 @@
                   ]
                 },
                 {
-                  "bytes": "e90df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                  "bytes": "3d91af52063e2eebb4fde740aad9e3aeef76c25b8f3f3b55950104b4b43d67b1"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "b9e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                 }
               ]
             }
@@ -504,7 +535,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "080df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                  "bytes": "09e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                 }
               ]
             },
@@ -524,7 +555,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "080df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                      "bytes": "09e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                     }
                   ]
                 },
@@ -549,7 +580,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "380df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                  "bytes": "58e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                 }
               ]
             },
@@ -569,7 +600,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "380df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                      "bytes": "58e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                     }
                   ]
                 },
@@ -594,7 +625,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "590df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                  "bytes": "68e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                 }
               ]
             },
@@ -614,7 +645,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "590df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                      "bytes": "68e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                     }
                   ]
                 },
@@ -639,7 +670,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6f03b5328890972f66678b7c8620f701711b441fdd108db3841963a537271467"
+                  "bytes": "cb813e5ea83f864c34ee570584765623cf820bc16e9f292d397361547d333995"
                 }
               ]
             },
@@ -659,7 +690,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6f03b5328890972f66678b7c8620f701711b441fdd108db3841963a537271467"
+                      "bytes": "cb813e5ea83f864c34ee570584765623cf820bc16e9f292d397361547d333995"
                     }
                   ]
                 },
@@ -1227,6 +1258,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "100000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1312,7 +1431,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1331,7 +1450,52 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "775b0c1ca526a04f071487b6f5a373669fd6b9a6e0dbbead03d45edd1a13a79d"
+                  "bytes": "3d91af52063e2eebb4fde740aad9e3aeef76c25b8f3f3b55950104b4b43d67b1"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "3d91af52063e2eebb4fde740aad9e3aeef76c25b8f3f3b55950104b4b43d67b1"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "7b813e5ea83f864c34ee570584765623cf820bc16e9f292d397361547d333995"
                 }
               ]
             },
@@ -1351,7 +1515,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "775b0c1ca526a04f071487b6f5a373669fd6b9a6e0dbbead03d45edd1a13a79d"
+                      "bytes": "7b813e5ea83f864c34ee570584765623cf820bc16e9f292d397361547d333995"
                     }
                   ]
                 },
@@ -1376,7 +1540,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "df03b5328890972f66678b7c8620f701711b441fdd108db3841963a537271467"
+                  "bytes": "b9e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                 }
               ]
             },
@@ -1396,7 +1560,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "df03b5328890972f66678b7c8620f701711b441fdd108db3841963a537271467"
+                      "bytes": "b9e8f545132ae2825101804d9b8f111c152c9deee592a354c4aeebd982c358a7"
                     }
                   ]
                 },
@@ -1421,7 +1585,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e90df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                  "bytes": "bc429d5f8a16ebeaf34ec95d0cc31d0d31413ccc4786b4444caf080e190e8d31"
                 }
               ]
             },
@@ -1441,7 +1605,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e90df4c86447851a68f6f20f653450362af11a1c9fc30299aae3fd7d74675c33"
+                      "bytes": "bc429d5f8a16ebeaf34ec95d0cc31d0d31413ccc4786b4444caf080e190e8d31"
                     }
                   ]
                 },
@@ -1456,6 +1620,63 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1774,6 +1995,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_duplicate_position.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_duplicate_position.1.json
index 4ad6e62..5488704 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_duplicate_position.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_duplicate_position.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "70bdbe708206b760001157afee867e9c96305f8ff25df6fdbf22f86f7e990408"
+                  "bytes": "65aece234503ffbbcc803bda15decbba8781e088d97bd78afcdcddb70998db3f"
                 }
               ]
             }
@@ -688,7 +688,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "70bdbe708206b760001157afee867e9c96305f8ff25df6fdbf22f86f7e990408"
+                  "bytes": "65aece234503ffbbcc803bda15decbba8781e088d97bd78afcdcddb70998db3f"
                 }
               ]
             },
@@ -708,7 +708,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "70bdbe708206b760001157afee867e9c96305f8ff25df6fdbf22f86f7e990408"
+                      "bytes": "65aece234503ffbbcc803bda15decbba8781e088d97bd78afcdcddb70998db3f"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_second_call_winners_already_selected.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_second_call_winners_already_selected.1.json
index 047c930..a16be80 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_second_call_winners_already_selected.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_rejects_second_call_winners_already_selected.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "16877adb85ab8e38082c159f3e14c8bbf018e4062fcfb933a8c21d81f1f226fa"
+                  "bytes": "8d53447fccbecfc8414f443026d8955f3710605bb8f42f9974e381a2a9b88a35"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "4f89da316eded76bbf9f461a58499297e60fd2c1528d0c148ade66a8213e8447"
+                  "bytes": "03b0d37b5ea2a152fc0cf4b1817567e43fcbba730aa8d45c8a6a5fe159e12476"
                 }
               ]
             }
@@ -866,7 +866,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "16877adb85ab8e38082c159f3e14c8bbf018e4062fcfb933a8c21d81f1f226fa"
+                  "bytes": "03b0d37b5ea2a152fc0cf4b1817567e43fcbba730aa8d45c8a6a5fe159e12476"
                 }
               ]
             },
@@ -886,7 +886,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "16877adb85ab8e38082c159f3e14c8bbf018e4062fcfb933a8c21d81f1f226fa"
+                      "bytes": "03b0d37b5ea2a152fc0cf4b1817567e43fcbba730aa8d45c8a6a5fe159e12476"
                     }
                   ]
                 },
@@ -911,7 +911,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4f89da316eded76bbf9f461a58499297e60fd2c1528d0c148ade66a8213e8447"
+                  "bytes": "8d53447fccbecfc8414f443026d8955f3710605bb8f42f9974e381a2a9b88a35"
                 }
               ]
             },
@@ -931,7 +931,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4f89da316eded76bbf9f461a58499297e60fd2c1528d0c148ade66a8213e8447"
+                      "bytes": "8d53447fccbecfc8414f443026d8955f3710605bb8f42f9974e381a2a9b88a35"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_replayed_reverts.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_replayed_reverts.1.json
index 00ea679..f373c1f 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_replayed_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_replayed_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "ed13217707255fe4e1cb2fb150876a2ec10a591e2fd39a6076f542721885cefe"
+                  "bytes": "f9c9a53e20a7e12dc7317f223615bff6e44d56ce7d0c2b43cdc1c0f4eb9925b5"
                 }
               ]
             }
@@ -298,7 +298,7 @@
                   ]
                 },
                 {
-                  "bytes": "4ab4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
+                  "bytes": "6323ee9cd85f4c663b4ee6454d569c83a1dd2627ea7c85dc748adc36b4eadc12"
                 }
               ]
             }
@@ -413,254 +413,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "100000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "9bb4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "9bb4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "abb4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "abb4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "fab4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "fab4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "50"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -899,7 +651,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -909,7 +661,7 @@
                       "val": {
                         "vec": [
                           {
-                            "symbol": "Completed"
+                            "symbol": "Active"
                           }
                         ]
                       }
@@ -1025,9 +777,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1109,7 +859,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4ab4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
+                  "bytes": "6323ee9cd85f4c663b4ee6454d569c83a1dd2627ea7c85dc748adc36b4eadc12"
                 }
               ]
             },
@@ -1129,7 +879,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4ab4cf11e72f7577c27c0227bc5d54708f3bd5025ab0673cde585151256bd124"
+                      "bytes": "6323ee9cd85f4c663b4ee6454d569c83a1dd2627ea7c85dc748adc36b4eadc12"
                     }
                   ]
                 },
@@ -1154,7 +904,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ed13217707255fe4e1cb2fb150876a2ec10a591e2fd39a6076f542721885cefe"
+                  "bytes": "f9c9a53e20a7e12dc7317f223615bff6e44d56ce7d0c2b43cdc1c0f4eb9925b5"
                 }
               ]
             },
@@ -1174,7 +924,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ed13217707255fe4e1cb2fb150876a2ec10a591e2fd39a6076f542721885cefe"
+                      "bytes": "f9c9a53e20a7e12dc7317f223615bff6e44d56ce7d0c2b43cdc1c0f4eb9925b5"
                     }
                   ]
                 },
@@ -1619,7 +1369,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -1717,76 +1467,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "100000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/cross_contract/select_winners_requires_position_in_distribution.1.json b/contracts/events/test_snapshots/tests/cross_contract/select_winners_requires_position_in_distribution.1.json
index 7edc68b..82cf9cb 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/select_winners_requires_position_in_distribution.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/select_winners_requires_position_in_distribution.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "6036bc32f677b926d3b2a5a1570fabb2e6571631a0f589f556a215de56b0e07b"
+                  "bytes": "e98ca277b1ac568bdc3a8052303ca1dfed0d38a9395484e4a08bc44834b0954a"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6036bc32f677b926d3b2a5a1570fabb2e6571631a0f589f556a215de56b0e07b"
+                  "bytes": "e98ca277b1ac568bdc3a8052303ca1dfed0d38a9395484e4a08bc44834b0954a"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6036bc32f677b926d3b2a5a1570fabb2e6571631a0f589f556a215de56b0e07b"
+                      "bytes": "e98ca277b1ac568bdc3a8052303ca1dfed0d38a9395484e4a08bc44834b0954a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/submit_replayed_reverts.1.json b/contracts/events/test_snapshots/tests/cross_contract/submit_replayed_reverts.1.json
index e42f3a5..827cad2 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/submit_replayed_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/submit_replayed_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "bfdbf82e1c66ecbd84e82e3741392e668bc339b8037b73055439cbc86229aad0"
+                  "bytes": "66abd8b4ce784aa8e29c345b750da795fb530046f387ca83b60f7824905eb5f7"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../v1.json"
                 },
                 {
-                  "bytes": "baf64ca825ddb78f4020688a5c036307337d09400c9711bfcc31a38e4c3e1c11"
+                  "bytes": "508f5231c683f9efcf6c8e81f1bf02e7a9f98c9dc2d14c638c78420a0762c547"
                 }
               ]
             }
@@ -776,7 +776,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "baf64ca825ddb78f4020688a5c036307337d09400c9711bfcc31a38e4c3e1c11"
+                  "bytes": "508f5231c683f9efcf6c8e81f1bf02e7a9f98c9dc2d14c638c78420a0762c547"
                 }
               ]
             },
@@ -796,7 +796,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "baf64ca825ddb78f4020688a5c036307337d09400c9711bfcc31a38e4c3e1c11"
+                      "bytes": "508f5231c683f9efcf6c8e81f1bf02e7a9f98c9dc2d14c638c78420a0762c547"
                     }
                   ]
                 },
@@ -821,7 +821,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bfdbf82e1c66ecbd84e82e3741392e668bc339b8037b73055439cbc86229aad0"
+                  "bytes": "66abd8b4ce784aa8e29c345b750da795fb530046f387ca83b60f7824905eb5f7"
                 }
               ]
             },
@@ -841,7 +841,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bfdbf82e1c66ecbd84e82e3741392e668bc339b8037b73055439cbc86229aad0"
+                      "bytes": "66abd8b4ce784aa8e29c345b750da795fb530046f387ca83b60f7824905eb5f7"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_removes_anchor.1.json b/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_removes_anchor.1.json
index adbea54..6a7f86a 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_removes_anchor.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_removes_anchor.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "0e92e7617646c416559e0dff5cf67527e3fa85fdc6ef42d612d4c951af5a14ae"
+                  "bytes": "f53d2461f34c866a43c9ad5eeb81598e2eac6a786a700614a1c5b77c6d94263d"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../v1.json"
                 },
                 {
-                  "bytes": "71789eb7ded94330e96b2386a52a38dbaba65ce48a3b4c7e09bde349d4868695"
+                  "bytes": "10280074849f163a6e8dfd40cf0891557282f2c8a7647f21876c7752490f4d19"
                 }
               ]
             }
@@ -297,7 +297,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "37667c7d60835092674fa91003bc64f8d381498acc6ce1051b4da1fd76ae4b35"
+                  "bytes": "37846c3083e2303e3451199f004b368c0873a534e7dc2dea4ad8e8fe6ff6cb78"
                 }
               ]
             }
@@ -725,7 +725,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0e92e7617646c416559e0dff5cf67527e3fa85fdc6ef42d612d4c951af5a14ae"
+                  "bytes": "10280074849f163a6e8dfd40cf0891557282f2c8a7647f21876c7752490f4d19"
                 }
               ]
             },
@@ -745,7 +745,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0e92e7617646c416559e0dff5cf67527e3fa85fdc6ef42d612d4c951af5a14ae"
+                      "bytes": "10280074849f163a6e8dfd40cf0891557282f2c8a7647f21876c7752490f4d19"
                     }
                   ]
                 },
@@ -770,7 +770,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "37667c7d60835092674fa91003bc64f8d381498acc6ce1051b4da1fd76ae4b35"
+                  "bytes": "37846c3083e2303e3451199f004b368c0873a534e7dc2dea4ad8e8fe6ff6cb78"
                 }
               ]
             },
@@ -790,7 +790,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "37667c7d60835092674fa91003bc64f8d381498acc6ce1051b4da1fd76ae4b35"
+                      "bytes": "37846c3083e2303e3451199f004b368c0873a534e7dc2dea4ad8e8fe6ff6cb78"
                     }
                   ]
                 },
@@ -815,7 +815,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "71789eb7ded94330e96b2386a52a38dbaba65ce48a3b4c7e09bde349d4868695"
+                  "bytes": "f53d2461f34c866a43c9ad5eeb81598e2eac6a786a700614a1c5b77c6d94263d"
                 }
               ]
             },
@@ -835,7 +835,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "71789eb7ded94330e96b2386a52a38dbaba65ce48a3b4c7e09bde349d4868695"
+                      "bytes": "f53d2461f34c866a43c9ad5eeb81598e2eac6a786a700614a1c5b77c6d94263d"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_without_submission_reverts.1.json b/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_without_submission_reverts.1.json
index bee8487..0eed7e8 100644
--- a/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_without_submission_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/cross_contract/withdraw_submission_without_submission_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "af019f0e1088c19d142d546b9fd1654f4c180d0f1888de9ec3b86067799a3d69"
+                  "bytes": "ed1ae0c321dce2bd62b00644ed38052b4138dc346b0253e6a9e782cc80210f1f"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "af019f0e1088c19d142d546b9fd1654f4c180d0f1888de9ec3b86067799a3d69"
+                  "bytes": "ed1ae0c321dce2bd62b00644ed38052b4138dc346b0253e6a9e782cc80210f1f"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "af019f0e1088c19d142d546b9fd1654f4c180d0f1888de9ec3b86067799a3d69"
+                      "bytes": "ed1ae0c321dce2bd62b00644ed38052b4138dc346b0253e6a9e782cc80210f1f"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/backer_pays_exactly_pledge_and_creator_bears_fee.1.json b/contracts/events/test_snapshots/tests/crowdfunding/backer_pays_exactly_pledge_and_creator_bears_fee.1.json
index b309690..0fb17d5 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/backer_pays_exactly_pledge_and_creator_bears_fee.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/backer_pays_exactly_pledge_and_creator_bears_fee.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "358cee557e4cdd1670dd215d3bec868d211324e09a38499715acd1da6b4f705c"
+                  "bytes": "456f6b2a143eafe6016932be854e4766e352dbd14f6d5dc59f205329299cc818"
                 }
               ]
             }
@@ -255,7 +255,7 @@
                   "i128": "1000000000"
                 },
                 {
-                  "bytes": "36db9eda409ab48ee857efd85a4d057e3929f1c2514b12e3b413ee742234f731"
+                  "bytes": "d30e59dad04fe20282f07d07a40651f09d2cc9751195404824fb0512b3f55ed0"
                 }
               ]
             }
@@ -310,7 +310,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "74d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                  "bytes": "d9dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                 }
               ]
             }
@@ -339,7 +339,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "74d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                  "bytes": "d9dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                 }
               ]
             }
@@ -517,7 +517,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "95d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                  "bytes": "08dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                 }
               ]
             },
@@ -537,7 +537,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "95d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                      "bytes": "08dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                     }
                   ]
                 },
@@ -562,7 +562,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a5d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                  "bytes": "38dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                 }
               ]
             },
@@ -582,7 +582,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a5d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                      "bytes": "38dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                     }
                   ]
                 },
@@ -607,7 +607,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c4d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                  "bytes": "69dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                 }
               ]
             },
@@ -627,7 +627,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c4d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                      "bytes": "69dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                     }
                   ]
                 },
@@ -1578,7 +1578,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "358cee557e4cdd1670dd215d3bec868d211324e09a38499715acd1da6b4f705c"
+                  "bytes": "456f6b2a143eafe6016932be854e4766e352dbd14f6d5dc59f205329299cc818"
                 }
               ]
             },
@@ -1598,7 +1598,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "358cee557e4cdd1670dd215d3bec868d211324e09a38499715acd1da6b4f705c"
+                      "bytes": "456f6b2a143eafe6016932be854e4766e352dbd14f6d5dc59f205329299cc818"
                     }
                   ]
                 },
@@ -1623,7 +1623,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "36db9eda409ab48ee857efd85a4d057e3929f1c2514b12e3b413ee742234f731"
+                  "bytes": "d30e59dad04fe20282f07d07a40651f09d2cc9751195404824fb0512b3f55ed0"
                 }
               ]
             },
@@ -1643,7 +1643,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "36db9eda409ab48ee857efd85a4d057e3929f1c2514b12e3b413ee742234f731"
+                      "bytes": "d30e59dad04fe20282f07d07a40651f09d2cc9751195404824fb0512b3f55ed0"
                     }
                   ]
                 },
@@ -1668,7 +1668,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "74d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                  "bytes": "d9dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                 }
               ]
             },
@@ -1688,7 +1688,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "74d1e198a9b8a095b1d704eed6e631a930ea0cc350941cf0aa0bfe87e0f86f1c"
+                      "bytes": "d9dbe0794804f297f1673530bd3a39fa5996690e1d29bb1285b2907b2c78b356"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/builder_top_up_does_not_appear_in_contributor_list.1.json b/contracts/events/test_snapshots/tests/crowdfunding/builder_top_up_does_not_appear_in_contributor_list.1.json
index 0a30c7c..e7570e0 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/builder_top_up_does_not_appear_in_contributor_list.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/builder_top_up_does_not_appear_in_contributor_list.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "775f376a1ada83dafb04c75db081482697a2b88488bc4a3b907623a0330bb669"
+                  "bytes": "73f181964adcb8c77db6884259dea325d3f247af1a2436b7000dace0d223f587"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "1000000000"
                 },
                 {
-                  "bytes": "ddc0c061b9c69e606747409332be328e33039b729a90ceda89e43ff62dc0914f"
+                  "bytes": "efb8a87e24712b4e7b719e2a4d1dc73f48d0589fb864a356d94bb4950de4cb2b"
                 }
               ]
             }
@@ -840,7 +840,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "775f376a1ada83dafb04c75db081482697a2b88488bc4a3b907623a0330bb669"
+                  "bytes": "73f181964adcb8c77db6884259dea325d3f247af1a2436b7000dace0d223f587"
                 }
               ]
             },
@@ -860,7 +860,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "775f376a1ada83dafb04c75db081482697a2b88488bc4a3b907623a0330bb669"
+                      "bytes": "73f181964adcb8c77db6884259dea325d3f247af1a2436b7000dace0d223f587"
                     }
                   ]
                 },
@@ -885,7 +885,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ddc0c061b9c69e606747409332be328e33039b729a90ceda89e43ff62dc0914f"
+                  "bytes": "efb8a87e24712b4e7b719e2a4d1dc73f48d0589fb864a356d94bb4950de4cb2b"
                 }
               ]
             },
@@ -905,7 +905,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ddc0c061b9c69e606747409332be328e33039b729a90ceda89e43ff62dc0914f"
+                      "bytes": "efb8a87e24712b4e7b719e2a4d1dc73f48d0589fb864a356d94bb4950de4cb2b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/cancel_after_partial_claim_pro_rates_remaining.1.json b/contracts/events/test_snapshots/tests/crowdfunding/cancel_after_partial_claim_pro_rates_remaining.1.json
index 4ca9c8f..12d1364 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/cancel_after_partial_claim_pro_rates_remaining.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/cancel_after_partial_claim_pro_rates_remaining.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "9ccb2fe2e08fb4278e4fe4f800d84b1162eb707f89b9af3be15278728b2bfdf1"
+                  "bytes": "890906053d14418e691bdde0de5c7a31b0ddd99b745aa2d7da3ef7d37bd38a02"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "3000000000"
                 },
                 {
-                  "bytes": "8c3f01e49edc0091917538ea0009c3e728ae5922666ba7b9e09df5f4efdfe92b"
+                  "bytes": "d12d48fa213c5bc99cee40087a91b2d9a47a0e087b88796fba9c50a0d4e8ded6"
                 }
               ]
             }
@@ -325,7 +325,7 @@
                   "i128": "6000000000"
                 },
                 {
-                  "bytes": "a9024cb0c89ad3765ec70267e0d6daf9174951b850c944eceb0992cf93a42910"
+                  "bytes": "423b5caba9eb7f145ac4c8584624681bc232094fe6c10a941be576b35717c4a6"
                 }
               ]
             }
@@ -377,7 +377,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "d74597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                  "bytes": "b226b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                 }
               ]
             }
@@ -406,7 +406,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "d74597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                  "bytes": "b226b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                 }
               ]
             }
@@ -430,7 +430,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "4d20e56b180cff9c571b2b0fb25a7a5e96256476d31f5752a71851ea579d425e"
+                  "bytes": "adb5474a81acf2f22c2b5df2068ae6fec5d64dc8d69e111f7bc62f6f7f61ee26"
                 }
               ]
             }
@@ -456,7 +456,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "42995fc28a65970581105b54d822af7526c51aa28dd5a0a7bef5fb5dcd8da4c5"
+                  "bytes": "b6f0c138776fc820304a43a3e42825ded38843b807e0b4e8a75e197a8fc37d0c"
                 }
               ]
             }
@@ -478,7 +478,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "71778914a59996e666b6e292e2af837ecf24325158d41b29f820717747450c98"
+                  "bytes": "ba8f68ceb637651fca0f246a1c6e55fd469e258f461702671817b74b9ed1aa2a"
                 }
               ]
             }
@@ -656,7 +656,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "064597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                  "bytes": "0226b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                 }
               ]
             },
@@ -676,7 +676,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "064597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                      "bytes": "0226b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                     }
                   ]
                 },
@@ -701,7 +701,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "364597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                  "bytes": "5326b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                 }
               ]
             },
@@ -721,7 +721,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "364597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                      "bytes": "5326b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                     }
                   ]
                 },
@@ -746,7 +746,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "674597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                  "bytes": "6326b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                 }
               ]
             },
@@ -766,7 +766,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "674597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                      "bytes": "6326b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                     }
                   ]
                 },
@@ -1870,7 +1870,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "42995fc28a65970581105b54d822af7526c51aa28dd5a0a7bef5fb5dcd8da4c5"
+                  "bytes": "423b5caba9eb7f145ac4c8584624681bc232094fe6c10a941be576b35717c4a6"
                 }
               ]
             },
@@ -1890,7 +1890,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "42995fc28a65970581105b54d822af7526c51aa28dd5a0a7bef5fb5dcd8da4c5"
+                      "bytes": "423b5caba9eb7f145ac4c8584624681bc232094fe6c10a941be576b35717c4a6"
                     }
                   ]
                 },
@@ -1915,7 +1915,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4d20e56b180cff9c571b2b0fb25a7a5e96256476d31f5752a71851ea579d425e"
+                  "bytes": "890906053d14418e691bdde0de5c7a31b0ddd99b745aa2d7da3ef7d37bd38a02"
                 }
               ]
             },
@@ -1935,7 +1935,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4d20e56b180cff9c571b2b0fb25a7a5e96256476d31f5752a71851ea579d425e"
+                      "bytes": "890906053d14418e691bdde0de5c7a31b0ddd99b745aa2d7da3ef7d37bd38a02"
                     }
                   ]
                 },
@@ -1960,7 +1960,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "71778914a59996e666b6e292e2af837ecf24325158d41b29f820717747450c98"
+                  "bytes": "adb5474a81acf2f22c2b5df2068ae6fec5d64dc8d69e111f7bc62f6f7f61ee26"
                 }
               ]
             },
@@ -1980,7 +1980,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "71778914a59996e666b6e292e2af837ecf24325158d41b29f820717747450c98"
+                      "bytes": "adb5474a81acf2f22c2b5df2068ae6fec5d64dc8d69e111f7bc62f6f7f61ee26"
                     }
                   ]
                 },
@@ -2005,7 +2005,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8c3f01e49edc0091917538ea0009c3e728ae5922666ba7b9e09df5f4efdfe92b"
+                  "bytes": "b226b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                 }
               ]
             },
@@ -2025,7 +2025,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8c3f01e49edc0091917538ea0009c3e728ae5922666ba7b9e09df5f4efdfe92b"
+                      "bytes": "b226b5b0763be1e660978ccf1c34a141fec4622f2b65b93ff6a2441583165417"
                     }
                   ]
                 },
@@ -2050,7 +2050,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9ccb2fe2e08fb4278e4fe4f800d84b1162eb707f89b9af3be15278728b2bfdf1"
+                  "bytes": "b6f0c138776fc820304a43a3e42825ded38843b807e0b4e8a75e197a8fc37d0c"
                 }
               ]
             },
@@ -2070,7 +2070,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9ccb2fe2e08fb4278e4fe4f800d84b1162eb707f89b9af3be15278728b2bfdf1"
+                      "bytes": "b6f0c138776fc820304a43a3e42825ded38843b807e0b4e8a75e197a8fc37d0c"
                     }
                   ]
                 },
@@ -2095,7 +2095,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a9024cb0c89ad3765ec70267e0d6daf9174951b850c944eceb0992cf93a42910"
+                  "bytes": "ba8f68ceb637651fca0f246a1c6e55fd469e258f461702671817b74b9ed1aa2a"
                 }
               ]
             },
@@ -2115,7 +2115,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a9024cb0c89ad3765ec70267e0d6daf9174951b850c944eceb0992cf93a42910"
+                      "bytes": "ba8f68ceb637651fca0f246a1c6e55fd469e258f461702671817b74b9ed1aa2a"
                     }
                   ]
                 },
@@ -2140,7 +2140,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d74597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                  "bytes": "d12d48fa213c5bc99cee40087a91b2d9a47a0e087b88796fba9c50a0d4e8ded6"
                 }
               ]
             },
@@ -2160,7 +2160,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d74597e37b88bbc1da93057ebb5b2aae00523f49620a76ace83f50ff39ce4f60"
+                      "bytes": "d12d48fa213c5bc99cee40087a91b2d9a47a0e087b88796fba9c50a0d4e8ded6"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/cancel_refunds_all_partners_no_owner_residual.1.json b/contracts/events/test_snapshots/tests/crowdfunding/cancel_refunds_all_partners_no_owner_residual.1.json
index b4af395..308c091 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/cancel_refunds_all_partners_no_owner_residual.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/cancel_refunds_all_partners_no_owner_residual.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "6e2e4ff8e87db8aba0ac54cef4c15db1456e4ab5db0297f3a75cc824062b4b7e"
+                  "bytes": "88abd4794fdea62d232e869e0bb528625a201ad57d09e6f217eaf8d799cdcc02"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "3ce418b1d9dbc64528b63eed2d257d8b7a92e418587357f1f2909b6ce3c592ee"
+                  "bytes": "16692e8ea2b028c237ccfdcf7297b60fb0d59a71c0b7d9ae9d5228b6f589e9d7"
                 }
               ]
             }
@@ -325,7 +325,7 @@
                   "i128": "3000000000"
                 },
                 {
-                  "bytes": "74b4f812ec1d188a93459840b22f279414b61024fd1dfcab941ecfe27ab4b7b5"
+                  "bytes": "23b979b3233aca27ed9cb19e575e1051cad9eb9c1a49bc920848ea917fc8d6b3"
                 }
               ]
             }
@@ -371,7 +371,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "f9eb60b2d252e84aa70d7d4c3e617ac6729463e61da435de56f6cdce0749423a"
+                  "bytes": "301a7a16540a5d0578c2e1a4df03564cbc3d3e9e5c85027736e8745f63d9bd33"
                 }
               ]
             }
@@ -397,7 +397,7 @@
                   "u32": 25
                 },
                 {
-                  "bytes": "d0b5cdd6dd416c49d40cc82ac5d68ddc5cb3649dcd1c6a7a6517a0d2c55c1732"
+                  "bytes": "cb5aa47abb487b28efdc877b0c182cb9a051509c75ef55c00c21c40e991f9982"
                 }
               ]
             }
@@ -419,7 +419,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "4f68ab0fcd3010944d3f74e9cce629b66d80508d621235a8b72a203c16c73592"
+                  "bytes": "d1477a3e5e07ca4401ba7cdb3368e8493a643970979cbc98ee894054e9f23740"
                 }
               ]
             }
@@ -1337,7 +1337,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3ce418b1d9dbc64528b63eed2d257d8b7a92e418587357f1f2909b6ce3c592ee"
+                  "bytes": "16692e8ea2b028c237ccfdcf7297b60fb0d59a71c0b7d9ae9d5228b6f589e9d7"
                 }
               ]
             },
@@ -1357,7 +1357,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3ce418b1d9dbc64528b63eed2d257d8b7a92e418587357f1f2909b6ce3c592ee"
+                      "bytes": "16692e8ea2b028c237ccfdcf7297b60fb0d59a71c0b7d9ae9d5228b6f589e9d7"
                     }
                   ]
                 },
@@ -1382,7 +1382,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4f68ab0fcd3010944d3f74e9cce629b66d80508d621235a8b72a203c16c73592"
+                  "bytes": "23b979b3233aca27ed9cb19e575e1051cad9eb9c1a49bc920848ea917fc8d6b3"
                 }
               ]
             },
@@ -1402,7 +1402,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4f68ab0fcd3010944d3f74e9cce629b66d80508d621235a8b72a203c16c73592"
+                      "bytes": "23b979b3233aca27ed9cb19e575e1051cad9eb9c1a49bc920848ea917fc8d6b3"
                     }
                   ]
                 },
@@ -1427,7 +1427,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6e2e4ff8e87db8aba0ac54cef4c15db1456e4ab5db0297f3a75cc824062b4b7e"
+                  "bytes": "301a7a16540a5d0578c2e1a4df03564cbc3d3e9e5c85027736e8745f63d9bd33"
                 }
               ]
             },
@@ -1447,7 +1447,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6e2e4ff8e87db8aba0ac54cef4c15db1456e4ab5db0297f3a75cc824062b4b7e"
+                      "bytes": "301a7a16540a5d0578c2e1a4df03564cbc3d3e9e5c85027736e8745f63d9bd33"
                     }
                   ]
                 },
@@ -1472,7 +1472,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "74b4f812ec1d188a93459840b22f279414b61024fd1dfcab941ecfe27ab4b7b5"
+                  "bytes": "88abd4794fdea62d232e869e0bb528625a201ad57d09e6f217eaf8d799cdcc02"
                 }
               ]
             },
@@ -1492,7 +1492,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "74b4f812ec1d188a93459840b22f279414b61024fd1dfcab941ecfe27ab4b7b5"
+                      "bytes": "88abd4794fdea62d232e869e0bb528625a201ad57d09e6f217eaf8d799cdcc02"
                     }
                   ]
                 },
@@ -1517,7 +1517,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d0b5cdd6dd416c49d40cc82ac5d68ddc5cb3649dcd1c6a7a6517a0d2c55c1732"
+                  "bytes": "cb5aa47abb487b28efdc877b0c182cb9a051509c75ef55c00c21c40e991f9982"
                 }
               ]
             },
@@ -1537,7 +1537,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d0b5cdd6dd416c49d40cc82ac5d68ddc5cb3649dcd1c6a7a6517a0d2c55c1732"
+                      "bytes": "cb5aa47abb487b28efdc877b0c182cb9a051509c75ef55c00c21c40e991f9982"
                     }
                   ]
                 },
@@ -1562,7 +1562,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f9eb60b2d252e84aa70d7d4c3e617ac6729463e61da435de56f6cdce0749423a"
+                  "bytes": "d1477a3e5e07ca4401ba7cdb3368e8493a643970979cbc98ee894054e9f23740"
                 }
               ]
             },
@@ -1582,7 +1582,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f9eb60b2d252e84aa70d7d4c3e617ac6729463e61da435de56f6cdce0749423a"
+                      "bytes": "d1477a3e5e07ca4401ba7cdb3368e8493a643970979cbc98ee894054e9f23740"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/cancel_with_no_contributions_just_marks_cancelled.1.json b/contracts/events/test_snapshots/tests/crowdfunding/cancel_with_no_contributions_just_marks_cancelled.1.json
index 509776e..908bb7f 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/cancel_with_no_contributions_just_marks_cancelled.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/cancel_with_no_contributions_just_marks_cancelled.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "6c5cb257a8b79bf7a3c52babace044fcacb0bd47f1d8d2c781e7c0ffe2904dac"
+                  "bytes": "7a3363c1864c91d85c6ec36bc024da4e839f37f42f8bed4404ebe583239414b1"
                 }
               ]
             }
@@ -226,7 +226,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "5c8360b4dc72030f88c55966a349d7c320012959e5b8c7da8878c530154ec777"
+                  "bytes": "1ab68d421b28694c15bd4ac8d4be1ae91c1ce179aea787c948781e2e47a2622a"
                 }
               ]
             }
@@ -791,7 +791,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5c8360b4dc72030f88c55966a349d7c320012959e5b8c7da8878c530154ec777"
+                  "bytes": "1ab68d421b28694c15bd4ac8d4be1ae91c1ce179aea787c948781e2e47a2622a"
                 }
               ]
             },
@@ -811,7 +811,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5c8360b4dc72030f88c55966a349d7c320012959e5b8c7da8878c530154ec777"
+                      "bytes": "1ab68d421b28694c15bd4ac8d4be1ae91c1ce179aea787c948781e2e47a2622a"
                     }
                   ]
                 },
@@ -836,7 +836,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6c5cb257a8b79bf7a3c52babace044fcacb0bd47f1d8d2c781e7c0ffe2904dac"
+                  "bytes": "7a3363c1864c91d85c6ec36bc024da4e839f37f42f8bed4404ebe583239414b1"
                 }
               ]
             },
@@ -856,7 +856,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6c5cb257a8b79bf7a3c52babace044fcacb0bd47f1d8d2c781e7c0ffe2904dac"
+                      "bytes": "7a3363c1864c91d85c6ec36bc024da4e839f37f42f8bed4404ebe583239414b1"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_last_drains_dust_with_fee.1.json b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_last_drains_dust_with_fee.1.json
index 557b40d..e5213c1 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_last_drains_dust_with_fee.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_last_drains_dust_with_fee.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "c8473b1bf40f328a60ef5c706a348298dd48bd8dd745daf27a1a802e02dbb591"
+                  "bytes": "ab19690ab90e7fc6a37544812368da92a70399449d839b1cf7343ed8bfe1da4a"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "100000001"
                 },
                 {
-                  "bytes": "4114f2bd9ca652919ac102b633709e7450dbee0b732d568291f9db1d6eb46a80"
+                  "bytes": "141183669ba3514e816b1124c7169b3d31d42363850bd1d9bd4e9b21356eeba1"
                 }
               ]
             }
@@ -308,7 +308,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "ec2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                  "bytes": "3a183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                 }
               ]
             }
@@ -337,7 +337,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "ec2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                  "bytes": "3a183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                 }
               ]
             }
@@ -368,7 +368,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "9658fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                  "bytes": "a09666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                 }
               ]
             }
@@ -397,7 +397,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "9658fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                  "bytes": "a09666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                 }
               ]
             }
@@ -428,7 +428,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "3b08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                  "bytes": "7db3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                 }
               ]
             }
@@ -457,7 +457,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "3b08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                  "bytes": "7db3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                 }
               ]
             }
@@ -635,7 +635,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0d2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                  "bytes": "109666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                 }
               ]
             },
@@ -655,7 +655,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0d2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                      "bytes": "109666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                     }
                   ]
                 },
@@ -680,7 +680,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2658fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                  "bytes": "419666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                 }
               ]
             },
@@ -700,7 +700,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2658fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                      "bytes": "419666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                     }
                   ]
                 },
@@ -725,7 +725,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3d2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                  "bytes": "719666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                 }
               ]
             },
@@ -745,7 +745,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3d2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                      "bytes": "719666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                     }
                   ]
                 },
@@ -770,7 +770,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4758fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                  "bytes": "8a183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                 }
               ]
             },
@@ -790,7 +790,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4758fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                      "bytes": "8a183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                     }
                   ]
                 },
@@ -815,7 +815,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5c2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                  "bytes": "9cb3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                 }
               ]
             },
@@ -835,7 +835,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5c2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                      "bytes": "9cb3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                     }
                   ]
                 },
@@ -860,7 +860,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7758fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                  "bytes": "acb3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                 }
               ]
             },
@@ -880,7 +880,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7758fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                      "bytes": "acb3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                     }
                   ]
                 },
@@ -905,7 +905,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8b08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                  "bytes": "cdb3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                 }
               ]
             },
@@ -925,7 +925,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8b08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                      "bytes": "cdb3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                     }
                   ]
                 },
@@ -950,7 +950,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "da08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                  "bytes": "db183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                 }
               ]
             },
@@ -970,7 +970,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "da08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                      "bytes": "db183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                     }
                   ]
                 },
@@ -995,7 +995,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ea08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                  "bytes": "eb183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                 }
               ]
             },
@@ -1015,7 +1015,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ea08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                      "bytes": "eb183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                     }
                   ]
                 },
@@ -2330,7 +2330,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3b08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                  "bytes": "141183669ba3514e816b1124c7169b3d31d42363850bd1d9bd4e9b21356eeba1"
                 }
               ]
             },
@@ -2350,7 +2350,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3b08ac72736b3ccd968f28701ccb6e3662d7c4c18ab57322ff911e4fd27322c5"
+                      "bytes": "141183669ba3514e816b1124c7169b3d31d42363850bd1d9bd4e9b21356eeba1"
                     }
                   ]
                 },
@@ -2375,7 +2375,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4114f2bd9ca652919ac102b633709e7450dbee0b732d568291f9db1d6eb46a80"
+                  "bytes": "3a183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                 }
               ]
             },
@@ -2395,7 +2395,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4114f2bd9ca652919ac102b633709e7450dbee0b732d568291f9db1d6eb46a80"
+                      "bytes": "3a183b1ed3ca85b29ac7b8c29e1966ce68b6139cb571e097a3d744ad7abe32a3"
                     }
                   ]
                 },
@@ -2420,7 +2420,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9658fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                  "bytes": "7db3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                 }
               ]
             },
@@ -2440,7 +2440,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9658fe69f069d8e4a3f73fa9755c3b8c350a5f16a5756697b66cc815a30e0025"
+                      "bytes": "7db3ee269cb4f80c5dc23b5cf795b473cf7618b5b503910f477b77631c3275e7"
                     }
                   ]
                 },
@@ -2465,7 +2465,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c8473b1bf40f328a60ef5c706a348298dd48bd8dd745daf27a1a802e02dbb591"
+                  "bytes": "a09666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                 }
               ]
             },
@@ -2485,7 +2485,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c8473b1bf40f328a60ef5c706a348298dd48bd8dd745daf27a1a802e02dbb591"
+                      "bytes": "a09666d69434f04dbd8cce40ff42891074f9be33aacea7adfa0e94bef357a295"
                     }
                   ]
                 },
@@ -2510,7 +2510,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ec2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                  "bytes": "ab19690ab90e7fc6a37544812368da92a70399449d839b1cf7343ed8bfe1da4a"
                 }
               ]
             },
@@ -2530,7 +2530,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ec2b69fb77891bc93a2f3959519e1c51e753e10dbd07b66649b6198b680da8c7"
+                      "bytes": "ab19690ab90e7fc6a37544812368da92a70399449d839b1cf7343ed8bfe1da4a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_out_of_range_reverts.1.json b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_out_of_range_reverts.1.json
index bf99cb4..e4d83b3 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_out_of_range_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_out_of_range_reverts.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "7ad5a9079631f3d3373aa2d2e0216107e7fb5eec0ad98c00dd9ce0ba106d485a"
+                  "bytes": "ae7a79fcfbf8639075ad74723302e38105bfb6dc3741445acb3c76191f9dac27"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "4000000000"
                 },
                 {
-                  "bytes": "f0a5ed8208ff5e6ac4eef37bea79805b684c8263381aec6f8fdb440bd4057c7d"
+                  "bytes": "906af45c6443191f07ab7ccb8b76c476b3e0acdb5cbdc43b7ab2ac663e545bce"
                 }
               ]
             }
@@ -1037,7 +1037,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7ad5a9079631f3d3373aa2d2e0216107e7fb5eec0ad98c00dd9ce0ba106d485a"
+                  "bytes": "906af45c6443191f07ab7ccb8b76c476b3e0acdb5cbdc43b7ab2ac663e545bce"
                 }
               ]
             },
@@ -1057,7 +1057,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7ad5a9079631f3d3373aa2d2e0216107e7fb5eec0ad98c00dd9ce0ba106d485a"
+                      "bytes": "906af45c6443191f07ab7ccb8b76c476b3e0acdb5cbdc43b7ab2ac663e545bce"
                     }
                   ]
                 },
@@ -1082,7 +1082,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f0a5ed8208ff5e6ac4eef37bea79805b684c8263381aec6f8fdb440bd4057c7d"
+                  "bytes": "ae7a79fcfbf8639075ad74723302e38105bfb6dc3741445acb3c76191f9dac27"
                 }
               ]
             },
@@ -1102,7 +1102,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f0a5ed8208ff5e6ac4eef37bea79805b684c8263381aec6f8fdb440bd4057c7d"
+                      "bytes": "ae7a79fcfbf8639075ad74723302e38105bfb6dc3741445acb3c76191f9dac27"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_replay_reverts.1.json b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_replay_reverts.1.json
index 837373e..d26b118 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_replay_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_replay_reverts.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "45b6eb660319ddd85f435c8ab47ae740b7a17b7084ef39e34c3022e50f0efd4b"
+                  "bytes": "c5f847454fd4619fa491964dc21a2a75f018531de64763dfce0d14524ab8196d"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "6000000000"
                 },
                 {
-                  "bytes": "e5a6a3de52c9bacccfd542649a15ef73bcedd8e0ac5b5bea8c27abb0658351db"
+                  "bytes": "96a67c8626b31977e1b14bccc85e49fbfbf07b591065217b9d49a2c9296a4fa1"
                 }
               ]
             }
@@ -306,7 +306,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "14485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                  "bytes": "1587c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                 }
               ]
             }
@@ -335,7 +335,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "14485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                  "bytes": "1587c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                 }
               ]
             }
@@ -511,7 +511,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a4485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                  "bytes": "a587c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                 }
               ]
             },
@@ -531,7 +531,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a4485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                      "bytes": "a587c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                     }
                   ]
                 },
@@ -556,7 +556,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c5485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                  "bytes": "c487c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                 }
               ]
             },
@@ -576,7 +576,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c5485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                      "bytes": "c487c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                     }
                   ]
                 },
@@ -601,7 +601,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f5485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                  "bytes": "f487c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                 }
               ]
             },
@@ -621,7 +621,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f5485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                      "bytes": "f487c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                     }
                   ]
                 },
@@ -1572,7 +1572,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "14485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                  "bytes": "1587c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                 }
               ]
             },
@@ -1592,7 +1592,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "14485352e96918cbc5424ebb1e5c12919f0444c593ab401786b96746e07d12b6"
+                      "bytes": "1587c976b63f6517e3b50668bb268ee726fd8834614c7a24ffef613149907e19"
                     }
                   ]
                 },
@@ -1617,7 +1617,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "45b6eb660319ddd85f435c8ab47ae740b7a17b7084ef39e34c3022e50f0efd4b"
+                  "bytes": "96a67c8626b31977e1b14bccc85e49fbfbf07b591065217b9d49a2c9296a4fa1"
                 }
               ]
             },
@@ -1637,7 +1637,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "45b6eb660319ddd85f435c8ab47ae740b7a17b7084ef39e34c3022e50f0efd4b"
+                      "bytes": "96a67c8626b31977e1b14bccc85e49fbfbf07b591065217b9d49a2c9296a4fa1"
                     }
                   ]
                 },
@@ -1662,7 +1662,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e5a6a3de52c9bacccfd542649a15ef73bcedd8e0ac5b5bea8c27abb0658351db"
+                  "bytes": "c5f847454fd4619fa491964dc21a2a75f018531de64763dfce0d14524ab8196d"
                 }
               ]
             },
@@ -1682,7 +1682,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e5a6a3de52c9bacccfd542649a15ef73bcedd8e0ac5b5bea8c27abb0658351db"
+                      "bytes": "c5f847454fd4619fa491964dc21a2a75f018531de64763dfce0d14524ab8196d"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_splits_evenly_and_charges_fee_at_release.1.json b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_splits_evenly_and_charges_fee_at_release.1.json
index 3904735..0681642 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_splits_evenly_and_charges_fee_at_release.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_splits_evenly_and_charges_fee_at_release.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "c64e13f52868ed77b3700cb6d124f7ff6c265ec9affc06a637ac371c940520ec"
+                  "bytes": "7de6d8145111e52b36c7d8f92527836c1bf7fbbf2e9df4ec7e4175e71e49d74a"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "9000000000"
                 },
                 {
-                  "bytes": "57caf48086de9bf7a87a29098756c2aebf4657ee56124f51af5934320371006f"
+                  "bytes": "48e853ca31649372ff97ade7b155a704c12747e0db7bbb3d026be7b740b6a009"
                 }
               ]
             }
@@ -307,7 +307,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "f09e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                  "bytes": "b7c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                 }
               ]
             }
@@ -336,7 +336,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "f09e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                  "bytes": "b7c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                 }
               ]
             }
@@ -370,7 +370,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "56ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                  "bytes": "844e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                 }
               ]
             }
@@ -399,7 +399,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "56ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                  "bytes": "844e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                 }
               ]
             }
@@ -433,7 +433,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "02cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                  "bytes": "d92123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                 }
               ]
             }
@@ -462,7 +462,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "02cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                  "bytes": "d92123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                 }
               ]
             }
@@ -640,7 +640,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "119e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                  "bytes": "07c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                 }
               ]
             },
@@ -660,7 +660,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "119e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                      "bytes": "07c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                     }
                   ]
                 },
@@ -685,7 +685,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "219e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                  "bytes": "082123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                 }
               ]
             },
@@ -705,7 +705,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "219e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                      "bytes": "082123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                     }
                   ]
                 },
@@ -730,7 +730,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "409e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                  "bytes": "344e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                 }
               ]
             },
@@ -750,7 +750,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "409e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                      "bytes": "344e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                     }
                   ]
                 },
@@ -775,7 +775,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "87ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                  "bytes": "382123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                 }
               ]
             },
@@ -795,7 +795,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "87ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                      "bytes": "382123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                     }
                   ]
                 },
@@ -820,7 +820,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b2cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                  "bytes": "554e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                 }
               ]
             },
@@ -840,7 +840,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b2cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                      "bytes": "554e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                     }
                   ]
                 },
@@ -865,7 +865,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b7ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                  "bytes": "56c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                 }
               ]
             },
@@ -885,7 +885,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b7ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                      "bytes": "56c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                     }
                   ]
                 },
@@ -910,7 +910,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d3cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                  "bytes": "654e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                 }
               ]
             },
@@ -930,7 +930,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d3cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                      "bytes": "654e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                     }
                   ]
                 },
@@ -955,7 +955,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e3cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                  "bytes": "66c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                 }
               ]
             },
@@ -975,7 +975,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e3cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                      "bytes": "66c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                     }
                   ]
                 },
@@ -1000,7 +1000,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e6ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                  "bytes": "692123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                 }
               ]
             },
@@ -1020,7 +1020,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e6ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                      "bytes": "692123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                     }
                   ]
                 },
@@ -2335,7 +2335,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "02cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                  "bytes": "48e853ca31649372ff97ade7b155a704c12747e0db7bbb3d026be7b740b6a009"
                 }
               ]
             },
@@ -2355,7 +2355,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "02cd68f02503fbbcc8c1e992fc72339f3b0624c75e014249fd33762664fe2310"
+                      "bytes": "48e853ca31649372ff97ade7b155a704c12747e0db7bbb3d026be7b740b6a009"
                     }
                   ]
                 },
@@ -2380,7 +2380,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "56ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                  "bytes": "7de6d8145111e52b36c7d8f92527836c1bf7fbbf2e9df4ec7e4175e71e49d74a"
                 }
               ]
             },
@@ -2400,7 +2400,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "56ea03c0ea4f355f5a41bb697cd83dc7274f5dbb8c42d08209e3c07f92ddc769"
+                      "bytes": "7de6d8145111e52b36c7d8f92527836c1bf7fbbf2e9df4ec7e4175e71e49d74a"
                     }
                   ]
                 },
@@ -2425,7 +2425,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "57caf48086de9bf7a87a29098756c2aebf4657ee56124f51af5934320371006f"
+                  "bytes": "844e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                 }
               ]
             },
@@ -2445,7 +2445,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "57caf48086de9bf7a87a29098756c2aebf4657ee56124f51af5934320371006f"
+                      "bytes": "844e59c07936ff8617ed3406749af037ebf2d458037b937d414921cf5b2340db"
                     }
                   ]
                 },
@@ -2470,7 +2470,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c64e13f52868ed77b3700cb6d124f7ff6c265ec9affc06a637ac371c940520ec"
+                  "bytes": "b7c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                 }
               ]
             },
@@ -2490,7 +2490,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c64e13f52868ed77b3700cb6d124f7ff6c265ec9affc06a637ac371c940520ec"
+                      "bytes": "b7c89a345cdf3555d08ac74e9e0e18495b4e749bcf1cdae7804aee70efd91777"
                     }
                   ]
                 },
@@ -2515,7 +2515,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f09e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                  "bytes": "d92123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                 }
               ]
             },
@@ -2535,7 +2535,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f09e6870eddc833d09d31d1bc2d770567226330afb19481fafe092d5d3475489"
+                      "bytes": "d92123e47b3e6a8dc5a6f0c6b2e6a29bda50712c7563fdff70a240e10cfb968b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_with_empty_escrow_reverts.1.json b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_with_empty_escrow_reverts.1.json
index 572eaa6..484ea73 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_with_empty_escrow_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/claim_milestone_with_empty_escrow_reverts.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "574d9dac884d9258f0359a40d49d31482429be405ba76ad21f8b79e4e5817168"
+                  "bytes": "1da8c3f2346e27c34a862e231454d3b555a95eb6b036e80885ba5355043e4da4"
                 }
               ]
             }
@@ -768,7 +768,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "574d9dac884d9258f0359a40d49d31482429be405ba76ad21f8b79e4e5817168"
+                  "bytes": "1da8c3f2346e27c34a862e231454d3b555a95eb6b036e80885ba5355043e4da4"
                 }
               ]
             },
@@ -788,7 +788,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "574d9dac884d9258f0359a40d49d31482429be405ba76ad21f8b79e4e5817168"
+                      "bytes": "1da8c3f2346e27c34a862e231454d3b555a95eb6b036e80885ba5355043e4da4"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/community_top_ups_raise_escrow_from_zero.1.json b/contracts/events/test_snapshots/tests/crowdfunding/community_top_ups_raise_escrow_from_zero.1.json
index 82dc586..a02b12d 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/community_top_ups_raise_escrow_from_zero.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/community_top_ups_raise_escrow_from_zero.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "69c1920c68327e8e138dc5c1efcd8d8c10c26b5e1a91b1e638637a843eb647c1"
+                  "bytes": "a99cf431f51531ecc3085c53bfbf53ea2da11c9322dd45b68050ffedaa41adb6"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "4d697ec2aef25a6f3f3cf546ef0a67b9d91211d0ce0b9b59859841fdf02285bc"
+                  "bytes": "f9db4fb8661f8a04fadf484613140fd3b84e44f0480bf2614f07a9d096d00736"
                 }
               ]
             }
@@ -325,7 +325,7 @@
                   "i128": "3000000000"
                 },
                 {
-                  "bytes": "0a95e47101f303c06b8758001e4559e50fc94498a37d65fbc893563a89b2fb65"
+                  "bytes": "109e0df0aaafacb0758ec19ca227be0bfbd1e5a1ebc3cccbb088d3597a9cac34"
                 }
               ]
             }
@@ -1262,7 +1262,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0a95e47101f303c06b8758001e4559e50fc94498a37d65fbc893563a89b2fb65"
+                  "bytes": "109e0df0aaafacb0758ec19ca227be0bfbd1e5a1ebc3cccbb088d3597a9cac34"
                 }
               ]
             },
@@ -1282,7 +1282,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0a95e47101f303c06b8758001e4559e50fc94498a37d65fbc893563a89b2fb65"
+                      "bytes": "109e0df0aaafacb0758ec19ca227be0bfbd1e5a1ebc3cccbb088d3597a9cac34"
                     }
                   ]
                 },
@@ -1307,7 +1307,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4d697ec2aef25a6f3f3cf546ef0a67b9d91211d0ce0b9b59859841fdf02285bc"
+                  "bytes": "a99cf431f51531ecc3085c53bfbf53ea2da11c9322dd45b68050ffedaa41adb6"
                 }
               ]
             },
@@ -1327,7 +1327,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4d697ec2aef25a6f3f3cf546ef0a67b9d91211d0ce0b9b59859841fdf02285bc"
+                      "bytes": "a99cf431f51531ecc3085c53bfbf53ea2da11c9322dd45b68050ffedaa41adb6"
                     }
                   ]
                 },
@@ -1352,7 +1352,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "69c1920c68327e8e138dc5c1efcd8d8c10c26b5e1a91b1e638637a843eb647c1"
+                  "bytes": "f9db4fb8661f8a04fadf484613140fd3b84e44f0480bf2614f07a9d096d00736"
                 }
               ]
             },
@@ -1372,7 +1372,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "69c1920c68327e8e138dc5c1efcd8d8c10c26b5e1a91b1e638637a843eb647c1"
+                      "bytes": "f9db4fb8661f8a04fadf484613140fd3b84e44f0480bf2614f07a9d096d00736"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/create_with_zero_owner_deposit_and_auto_registered_winner.1.json b/contracts/events/test_snapshots/tests/crowdfunding/create_with_zero_owner_deposit_and_auto_registered_winner.1.json
index 119023d..1fd3718 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/create_with_zero_owner_deposit_and_auto_registered_winner.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/create_with_zero_owner_deposit_and_auto_registered_winner.1.json
@@ -205,7 +205,7 @@
                   ]
                 },
                 {
-                  "bytes": "ccf4e53e84fa34a3d3ecb06b9cb6849100fdb56beea5c2e139f331adf3d7db2d"
+                  "bytes": "979250430a12b933c05ffceeecb5dfc189a560aa8953e6ad7c078792cdf57cea"
                 }
               ]
             }
@@ -771,7 +771,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ccf4e53e84fa34a3d3ecb06b9cb6849100fdb56beea5c2e139f331adf3d7db2d"
+                  "bytes": "979250430a12b933c05ffceeecb5dfc189a560aa8953e6ad7c078792cdf57cea"
                 }
               ]
             },
@@ -791,7 +791,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ccf4e53e84fa34a3d3ecb06b9cb6849100fdb56beea5c2e139f331adf3d7db2d"
+                      "bytes": "979250430a12b933c05ffceeecb5dfc189a560aa8953e6ad7c078792cdf57cea"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/crowdfunding_claim_milestone_requires_admin_auth.1.json b/contracts/events/test_snapshots/tests/crowdfunding/crowdfunding_claim_milestone_requires_admin_auth.1.json
index 257cb0d..a2e153e 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/crowdfunding_claim_milestone_requires_admin_auth.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/crowdfunding_claim_milestone_requires_admin_auth.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "71de921c1ffe6a4dbe4f7080c31b3a9593e46bcf20cec23b9cb77a47fdd6799e"
+                  "bytes": "ec3374903c26a9e130fe4296d579ddfeffa478317133ada765b1e65ba21a1e75"
                 }
               ]
             }
@@ -254,7 +254,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "5fa750d443af21f0fabe34addcf0db777ba07740f1241dd2e237890811ed310b"
+                  "bytes": "1d7299dd353aa57723b2f2d7e8bf1f6a302adce3fc5c1f319ac8a3563ec71f42"
                 }
               ]
             }
@@ -306,7 +306,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "597a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                  "bytes": "bd76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                 }
               ]
             }
@@ -335,7 +335,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "597a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                  "bytes": "bd76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                 }
               ]
             }
@@ -510,7 +510,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "887a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                  "bytes": "0d76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                 }
               ]
             },
@@ -530,7 +530,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "887a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                      "bytes": "0d76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                     }
                   ]
                 },
@@ -555,7 +555,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b87a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                  "bytes": "5c76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                 }
               ]
             },
@@ -575,7 +575,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b87a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                      "bytes": "5c76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                     }
                   ]
                 },
@@ -600,7 +600,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e97a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                  "bytes": "6c76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                 }
               ]
             },
@@ -620,7 +620,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e97a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                      "bytes": "6c76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                     }
                   ]
                 },
@@ -1571,7 +1571,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "597a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                  "bytes": "1d7299dd353aa57723b2f2d7e8bf1f6a302adce3fc5c1f319ac8a3563ec71f42"
                 }
               ]
             },
@@ -1591,7 +1591,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "597a1a0d60f7b38332ac73be1f4320931030c43e0d31eacaba510bc872a8bd86"
+                      "bytes": "1d7299dd353aa57723b2f2d7e8bf1f6a302adce3fc5c1f319ac8a3563ec71f42"
                     }
                   ]
                 },
@@ -1616,7 +1616,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5fa750d443af21f0fabe34addcf0db777ba07740f1241dd2e237890811ed310b"
+                  "bytes": "bd76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                 }
               ]
             },
@@ -1636,7 +1636,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5fa750d443af21f0fabe34addcf0db777ba07740f1241dd2e237890811ed310b"
+                      "bytes": "bd76b77c4e9a7ad8bbd1c4e9ab72b8c59311488898bb498d6e7d7e80a0218477"
                     }
                   ]
                 },
@@ -1661,7 +1661,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "71de921c1ffe6a4dbe4f7080c31b3a9593e46bcf20cec23b9cb77a47fdd6799e"
+                  "bytes": "ec3374903c26a9e130fe4296d579ddfeffa478317133ada765b1e65ba21a1e75"
                 }
               ]
             },
@@ -1681,7 +1681,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "71de921c1ffe6a4dbe4f7080c31b3a9593e46bcf20cec23b9cb77a47fdd6799e"
+                      "bytes": "ec3374903c26a9e130fe4296d579ddfeffa478317133ada765b1e65ba21a1e75"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/select_winners_on_crowdfunding_reverts.1.json b/contracts/events/test_snapshots/tests/crowdfunding/select_winners_on_crowdfunding_reverts.1.json
index aa2c82f..497eba2 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/select_winners_on_crowdfunding_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/select_winners_on_crowdfunding_reverts.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "b989ae6654f69164b038be703dcc48a5b8321ad2599007c92d62f2f04ae0f921"
+                  "bytes": "3c3dc0b7a6350ecbfd393bae1e67495f4d59a92851e1d01929112f9d9efd3ec8"
                 }
               ]
             }
@@ -768,7 +768,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b989ae6654f69164b038be703dcc48a5b8321ad2599007c92d62f2f04ae0f921"
+                  "bytes": "3c3dc0b7a6350ecbfd393bae1e67495f4d59a92851e1d01929112f9d9efd3ec8"
                 }
               ]
             },
@@ -788,7 +788,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b989ae6654f69164b038be703dcc48a5b8321ad2599007c92d62f2f04ae0f921"
+                      "bytes": "3c3dc0b7a6350ecbfd393bae1e67495f4d59a92851e1d01929112f9d9efd3ec8"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/crowdfunding/submit_on_crowdfunding_reverts.1.json b/contracts/events/test_snapshots/tests/crowdfunding/submit_on_crowdfunding_reverts.1.json
index 205b67b..a2f733c 100644
--- a/contracts/events/test_snapshots/tests/crowdfunding/submit_on_crowdfunding_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/crowdfunding/submit_on_crowdfunding_reverts.1.json
@@ -204,7 +204,7 @@
                   ]
                 },
                 {
-                  "bytes": "06acb2dbcaa305b6759ad289d7bfcc37dcfacdf32dda4624aa56700e0c425cd4"
+                  "bytes": "a9a11b3e43b5e3942b66547a4d8b1495480d4993a1ffdf111f8199809c8d9bfa"
                 }
               ]
             }
@@ -768,7 +768,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "06acb2dbcaa305b6759ad289d7bfcc37dcfacdf32dda4624aa56700e0c425cd4"
+                  "bytes": "a9a11b3e43b5e3942b66547a4d8b1495480d4993a1ffdf111f8199809c8d9bfa"
                 }
               ]
             },
@@ -788,7 +788,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "06acb2dbcaa305b6759ad289d7bfcc37dcfacdf32dda4624aa56700e0c425cd4"
+                      "bytes": "a9a11b3e43b5e3942b66547a4d8b1495480d4993a1ffdf111f8199809c8d9bfa"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_uses_event_override_bps.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_uses_event_override_bps.1.json
index 00fcf63..61c919b 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_uses_event_override_bps.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_uses_event_override_bps.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "f7af24fb7dabf5a0695a333ec6772b8a2ed966bc473918236b7fbd1c75ee4779"
+                  "bytes": "11ce4d96789792c3078ec1871f80374372941ff6aa15eaf0dea5cf69fa0173f5"
                 }
               ]
             }
@@ -297,7 +297,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "b5194b78f3df6d0c0553623a3273359f8102b8b3402eb3ec16a508ada1c52b9a"
+                  "bytes": "ac536c617e82254c7140e219f407294339d2f8108fcca372952b3c9cee614c75"
                 }
               ]
             }
@@ -946,7 +946,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b5194b78f3df6d0c0553623a3273359f8102b8b3402eb3ec16a508ada1c52b9a"
+                  "bytes": "11ce4d96789792c3078ec1871f80374372941ff6aa15eaf0dea5cf69fa0173f5"
                 }
               ]
             },
@@ -966,7 +966,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b5194b78f3df6d0c0553623a3273359f8102b8b3402eb3ec16a508ada1c52b9a"
+                      "bytes": "11ce4d96789792c3078ec1871f80374372941ff6aa15eaf0dea5cf69fa0173f5"
                     }
                   ]
                 },
@@ -991,7 +991,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f7af24fb7dabf5a0695a333ec6772b8a2ed966bc473918236b7fbd1c75ee4779"
+                  "bytes": "ac536c617e82254c7140e219f407294339d2f8108fcca372952b3c9cee614c75"
                 }
               ]
             },
@@ -1011,7 +1011,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f7af24fb7dabf5a0695a333ec6772b8a2ed966bc473918236b7fbd1c75ee4779"
+                      "bytes": "ac536c617e82254c7140e219f407294339d2f8108fcca372952b3c9cee614c75"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_zero_override_bps_charges_no_fee.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_zero_override_bps_charges_no_fee.1.json
index e268d2c..90bc4f3 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_zero_override_bps_charges_no_fee.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/add_funds_zero_override_bps_charges_no_fee.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "d598c91dba54891f23462cfc108ff4c78c4affa406d07cd08b7277aba2643ed1"
+                  "bytes": "18f2989af125ede1c02c3ece18a9f15e0fb7e924df064a0138356b36185e3d4a"
                 }
               ]
             }
@@ -297,7 +297,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "effac87288455e62b6eb893f1f7bb05db1157e16196dab3e676d274411049209"
+                  "bytes": "1013971f817698a66a110d71e7103f89c23bcd577f38ad0a40320ddd8b5c5466"
                 }
               ]
             }
@@ -947,7 +947,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d598c91dba54891f23462cfc108ff4c78c4affa406d07cd08b7277aba2643ed1"
+                  "bytes": "1013971f817698a66a110d71e7103f89c23bcd577f38ad0a40320ddd8b5c5466"
                 }
               ]
             },
@@ -967,7 +967,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d598c91dba54891f23462cfc108ff4c78c4affa406d07cd08b7277aba2643ed1"
+                      "bytes": "1013971f817698a66a110d71e7103f89c23bcd577f38ad0a40320ddd8b5c5466"
                     }
                   ]
                 },
@@ -992,7 +992,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "effac87288455e62b6eb893f1f7bb05db1157e16196dab3e676d274411049209"
+                  "bytes": "18f2989af125ede1c02c3ece18a9f15e0fb7e924df064a0138356b36185e3d4a"
                 }
               ]
             },
@@ -1012,7 +1012,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "effac87288455e62b6eb893f1f7bb05db1157e16196dab3e676d274411049209"
+                      "bytes": "18f2989af125ede1c02c3ece18a9f15e0fb7e924df064a0138356b36185e3d4a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_milestone_split.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_milestone_split.1.json
index 1877236..d5c4010 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_milestone_split.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_milestone_split.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "46af0c423450ccb4f44bfe0eea2e29a1648281393198823e5e75c6a9b7b4d8dd"
+                  "bytes": "0452b470855837a957b9c494756d34271c37a1cb40ce1986b3c691eb4a1cdb33"
                 }
               ]
             }
@@ -276,7 +276,7 @@
                   "i128": "9000000000"
                 },
                 {
-                  "bytes": "85c65f37d8e86baa1d97c807eb6622431a56d17d29c9fec0c639d354d8d62590"
+                  "bytes": "9ed636558952a5e350c22cdcd542aca68a2a4c7dab01ca8a9842b9762818551e"
                 }
               ]
             }
@@ -329,7 +329,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "8a14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                  "bytes": "1188f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                 }
               ]
             }
@@ -358,7 +358,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "8a14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                  "bytes": "1188f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                 }
               ]
             }
@@ -390,7 +390,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "f05ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                  "bytes": "57bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                 }
               ]
             }
@@ -419,7 +419,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "f05ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                  "bytes": "57bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                 }
               ]
             }
@@ -451,7 +451,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "9ab12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                  "bytes": "9f9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                 }
               ]
             }
@@ -480,7 +480,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "9ab12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                  "bytes": "9f9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                 }
               ]
             }
@@ -657,7 +657,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "115ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                  "bytes": "2f9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                 }
               ]
             },
@@ -677,7 +677,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "115ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                      "bytes": "2f9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                     }
                   ]
                 },
@@ -702,7 +702,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "215ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                  "bytes": "4e9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                 }
               ]
             },
@@ -722,7 +722,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "215ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                      "bytes": "4e9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                     }
                   ]
                 },
@@ -747,7 +747,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2ab12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                  "bytes": "7e9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                 }
               ]
             },
@@ -767,7 +767,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2ab12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                      "bytes": "7e9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                     }
                   ]
                 },
@@ -792,7 +792,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3a14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                  "bytes": "86bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                 }
               ]
             },
@@ -812,7 +812,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3a14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                      "bytes": "86bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                     }
                   ]
                 },
@@ -837,7 +837,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "405ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                  "bytes": "a188f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                 }
               ]
             },
@@ -857,7 +857,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "405ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                      "bytes": "a188f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                     }
                   ]
                 },
@@ -882,7 +882,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4bb12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                  "bytes": "b6bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                 }
               ]
             },
@@ -902,7 +902,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4bb12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                      "bytes": "b6bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                     }
                   ]
                 },
@@ -927,7 +927,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5b14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                  "bytes": "c088f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                 }
               ]
             },
@@ -947,7 +947,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5b14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                      "bytes": "c088f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                     }
                   ]
                 },
@@ -972,7 +972,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6b14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                  "bytes": "e7bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                 }
               ]
             },
@@ -992,7 +992,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6b14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                      "bytes": "e7bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                     }
                   ]
                 },
@@ -1017,7 +1017,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7bb12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                  "bytes": "f088f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                 }
               ]
             },
@@ -1037,7 +1037,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7bb12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                      "bytes": "f088f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                     }
                   ]
                 },
@@ -2352,7 +2352,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "46af0c423450ccb4f44bfe0eea2e29a1648281393198823e5e75c6a9b7b4d8dd"
+                  "bytes": "0452b470855837a957b9c494756d34271c37a1cb40ce1986b3c691eb4a1cdb33"
                 }
               ]
             },
@@ -2372,7 +2372,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "46af0c423450ccb4f44bfe0eea2e29a1648281393198823e5e75c6a9b7b4d8dd"
+                      "bytes": "0452b470855837a957b9c494756d34271c37a1cb40ce1986b3c691eb4a1cdb33"
                     }
                   ]
                 },
@@ -2397,7 +2397,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "85c65f37d8e86baa1d97c807eb6622431a56d17d29c9fec0c639d354d8d62590"
+                  "bytes": "1188f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                 }
               ]
             },
@@ -2417,7 +2417,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "85c65f37d8e86baa1d97c807eb6622431a56d17d29c9fec0c639d354d8d62590"
+                      "bytes": "1188f1ee57e28fc9f6a350e0daaba1eb8d6d5361124d962edbf421cf2c4d8cf2"
                     }
                   ]
                 },
@@ -2442,7 +2442,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8a14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                  "bytes": "57bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                 }
               ]
             },
@@ -2462,7 +2462,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8a14163396097817ec8226f53c1866086cd7f823854580958502d15d0d9ea4cd"
+                      "bytes": "57bba54b6b16586f3f3019aa8579bae6d9dab328503a9ae4d208cb3db31276c3"
                     }
                   ]
                 },
@@ -2487,7 +2487,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9ab12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                  "bytes": "9ed636558952a5e350c22cdcd542aca68a2a4c7dab01ca8a9842b9762818551e"
                 }
               ]
             },
@@ -2507,7 +2507,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9ab12ab1c2c121c7b8d4075def41462d3748133890dc2c106173e6448895087c"
+                      "bytes": "9ed636558952a5e350c22cdcd542aca68a2a4c7dab01ca8a9842b9762818551e"
                     }
                   ]
                 },
@@ -2532,7 +2532,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f05ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                  "bytes": "9f9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                 }
               ]
             },
@@ -2552,7 +2552,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f05ced68c1ea14e644ae9bc9ef457160d3f974455b0365e0ed099ac853b95ace"
+                      "bytes": "9f9aed4dcf9976cd193054a07b1c4bca0aa74208e08b37164ee8d534e2a4deec"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_rounding_no_dust.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_rounding_no_dust.1.json
index 114b65c..aec0b1d 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_rounding_no_dust.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/crowdfunding_dynamic_rounding_no_dust.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "7c43eaa0f2cc593969d389c855170aaa391850032a55e5f1b4b618a56aaabec4"
+                  "bytes": "7469d64fe08575af2e5fb4628c60fef7c3094f70df126f9d526a71ff4c4478a9"
                 }
               ]
             }
@@ -276,7 +276,7 @@
                   "i128": "10000000001"
                 },
                 {
-                  "bytes": "45998dcb7c3fd86da320aa0d03232fff894e83db0236f4834a77abd89d2790a2"
+                  "bytes": "3c554cf4f9d41f50741ec25727a42e9fcbaf953c6ae6dc337771addbf799f8ad"
                 }
               ]
             }
@@ -328,7 +328,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "aff8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                  "bytes": "d14c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                 }
               ]
             }
@@ -357,7 +357,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "aff8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                  "bytes": "d14c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                 }
               ]
             }
@@ -389,7 +389,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "dfb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                  "bytes": "f59ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                 }
               ]
             }
@@ -418,7 +418,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "dfb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                  "bytes": "f59ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                 }
               ]
             }
@@ -450,7 +450,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "072a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                  "bytes": "c31eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                 }
               ]
             }
@@ -479,7 +479,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "072a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                  "bytes": "c31eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                 }
               ]
             }
@@ -655,7 +655,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0eb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                  "bytes": "004c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                 }
               ]
             },
@@ -675,7 +675,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0eb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                      "bytes": "004c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                     }
                   ]
                 },
@@ -700,7 +700,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1ff8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                  "bytes": "121eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                 }
               ]
             },
@@ -720,7 +720,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1ff8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                      "bytes": "121eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                     }
                   ]
                 },
@@ -745,7 +745,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3eb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                  "bytes": "149ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                 }
               ]
             },
@@ -765,7 +765,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3eb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                      "bytes": "149ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                     }
                   ]
                 },
@@ -790,7 +790,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4ef8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                  "bytes": "221eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                 }
               ]
             },
@@ -810,7 +810,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4ef8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                      "bytes": "221eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                     }
                   ]
                 },
@@ -835,7 +835,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6fb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                  "bytes": "249ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                 }
               ]
             },
@@ -855,7 +855,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6fb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                      "bytes": "249ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                     }
                   ]
                 },
@@ -880,7 +880,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7ef8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                  "bytes": "304c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                 }
               ]
             },
@@ -900,7 +900,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7ef8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                      "bytes": "304c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                     }
                   ]
                 },
@@ -925,7 +925,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b72a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                  "bytes": "459ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                 }
               ]
             },
@@ -945,7 +945,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b72a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                      "bytes": "459ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                     }
                   ]
                 },
@@ -970,7 +970,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d62a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                  "bytes": "614c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                 }
               ]
             },
@@ -990,7 +990,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d62a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                      "bytes": "614c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                     }
                   ]
                 },
@@ -1015,7 +1015,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e62a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                  "bytes": "731eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                 }
               ]
             },
@@ -1035,7 +1035,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e62a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                      "bytes": "731eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                     }
                   ]
                 },
@@ -2350,7 +2350,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "072a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                  "bytes": "3c554cf4f9d41f50741ec25727a42e9fcbaf953c6ae6dc337771addbf799f8ad"
                 }
               ]
             },
@@ -2370,7 +2370,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "072a88b7eaacfb1e78f4a16727b2955e5211fb6d485660386d519402c626187a"
+                      "bytes": "3c554cf4f9d41f50741ec25727a42e9fcbaf953c6ae6dc337771addbf799f8ad"
                     }
                   ]
                 },
@@ -2395,7 +2395,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "45998dcb7c3fd86da320aa0d03232fff894e83db0236f4834a77abd89d2790a2"
+                  "bytes": "7469d64fe08575af2e5fb4628c60fef7c3094f70df126f9d526a71ff4c4478a9"
                 }
               ]
             },
@@ -2415,7 +2415,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "45998dcb7c3fd86da320aa0d03232fff894e83db0236f4834a77abd89d2790a2"
+                      "bytes": "7469d64fe08575af2e5fb4628c60fef7c3094f70df126f9d526a71ff4c4478a9"
                     }
                   ]
                 },
@@ -2440,7 +2440,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7c43eaa0f2cc593969d389c855170aaa391850032a55e5f1b4b618a56aaabec4"
+                  "bytes": "c31eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                 }
               ]
             },
@@ -2460,7 +2460,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7c43eaa0f2cc593969d389c855170aaa391850032a55e5f1b4b618a56aaabec4"
+                      "bytes": "c31eb3308000c72f4860cb6cae06bdd39b6e7bdbe42c01a9ab94cde1cdaa8408"
                     }
                   ]
                 },
@@ -2485,7 +2485,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "aff8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                  "bytes": "d14c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                 }
               ]
             },
@@ -2505,7 +2505,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "aff8fb023fc6f2d81f5c29adfd5d478723d70cb09879e1e6937884aab106051b"
+                      "bytes": "d14c005d81f7c35ee62a4f46dd246675fe87fd10cdaf42e2b99ce0190a5bd117"
                     }
                   ]
                 },
@@ -2530,7 +2530,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dfb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                  "bytes": "f59ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                 }
               ]
             },
@@ -2550,7 +2550,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dfb68f30a7f51959cd906c0aedad826e4c9ab0a30bbed61dc87e05e00365bf6c"
+                      "bytes": "f59ef6e959882d15af3341da46fad82c89be0bb72f61914ee26719dd56326eae"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_account_accumulates_across_create_and_add_funds.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_account_accumulates_across_create_and_add_funds.1.json
index 6c4d584..c7bcdc6 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_account_accumulates_across_create_and_add_funds.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_account_accumulates_across_create_and_add_funds.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "705162ad57393251831d1edae14d3abed463fc8d01051d535c6524e11c5b6960"
+                  "bytes": "f13e37935a56b4b09e2c28c09bf3e8ecfaed9a5fb97e53b0af93dafde87b3276"
                 }
               ]
             }
@@ -295,7 +295,7 @@
                   "i128": "2000000000"
                 },
                 {
-                  "bytes": "94c9e2b3f483d6f7417e3b84d5ae9685caa19c98bf556bf7ac7e979db718b1ad"
+                  "bytes": "44d8fc2f0275299aed801e5ebe85e62a0f7f29c84bc048323fb7082ddfee5276"
                 }
               ]
             }
@@ -942,7 +942,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "705162ad57393251831d1edae14d3abed463fc8d01051d535c6524e11c5b6960"
+                  "bytes": "44d8fc2f0275299aed801e5ebe85e62a0f7f29c84bc048323fb7082ddfee5276"
                 }
               ]
             },
@@ -962,7 +962,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "705162ad57393251831d1edae14d3abed463fc8d01051d535c6524e11c5b6960"
+                      "bytes": "44d8fc2f0275299aed801e5ebe85e62a0f7f29c84bc048323fb7082ddfee5276"
                     }
                   ]
                 },
@@ -987,7 +987,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "94c9e2b3f483d6f7417e3b84d5ae9685caa19c98bf556bf7ac7e979db718b1ad"
+                  "bytes": "f13e37935a56b4b09e2c28c09bf3e8ecfaed9a5fb97e53b0af93dafde87b3276"
                 }
               ]
             },
@@ -1007,7 +1007,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "94c9e2b3f483d6f7417e3b84d5ae9685caa19c98bf556bf7ac7e979db718b1ad"
+                      "bytes": "f13e37935a56b4b09e2c28c09bf3e8ecfaed9a5fb97e53b0af93dafde87b3276"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_and_winner_balances_consistent.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_and_winner_balances_consistent.1.json
index 01279c0..48c4f1b 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_and_winner_balances_consistent.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_and_winner_balances_consistent.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "0b3116862b3d1bfd5e5369ab62ffc1097281ee9bf1db9940ba9b3c01f66e62ed"
+                  "bytes": "11ab8cd5470283e5242efc1e49bbb1fae45370cdf4e356578d06ce5ba6d5b1e2"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "4000000000"
                 },
                 {
-                  "bytes": "e4c578e4d580c12ecbc9ba23c165cfe8e002f3d75318e95c6cd189bf3409237a"
+                  "bytes": "0ac13d181f25ac9e92a441ed516016e4e5f81a27d07ee97cb8bf89eae3363a9a"
                 }
               ]
             }
@@ -369,7 +369,38 @@
                   ]
                 },
                 {
-                  "bytes": "52765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                  "bytes": "033c18597fc9cca605d860ca30a1b986f5bfa4d4b22a12988ef465a9e966dc13"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "75febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                 }
               ]
             }
@@ -547,7 +578,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "83765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                  "bytes": "94febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                 }
               ]
             },
@@ -567,7 +598,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "83765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                      "bytes": "94febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                     }
                   ]
                 },
@@ -592,7 +623,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b3765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                  "bytes": "a4febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                 }
               ]
             },
@@ -612,7 +643,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b3765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                      "bytes": "a4febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                     }
                   ]
                 },
@@ -637,7 +668,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e2765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                  "bytes": "c5febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                 }
               ]
             },
@@ -657,7 +688,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e2765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                      "bytes": "c5febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
                     }
                   ]
                 },
@@ -1276,6 +1307,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "14000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1361,7 +1480,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1380,7 +1499,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0b3116862b3d1bfd5e5369ab62ffc1097281ee9bf1db9940ba9b3c01f66e62ed"
+                  "bytes": "033c18597fc9cca605d860ca30a1b986f5bfa4d4b22a12988ef465a9e966dc13"
                 }
               ]
             },
@@ -1400,7 +1519,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0b3116862b3d1bfd5e5369ab62ffc1097281ee9bf1db9940ba9b3c01f66e62ed"
+                      "bytes": "033c18597fc9cca605d860ca30a1b986f5bfa4d4b22a12988ef465a9e966dc13"
                     }
                   ]
                 },
@@ -1425,7 +1544,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "52765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                  "bytes": "0ac13d181f25ac9e92a441ed516016e4e5f81a27d07ee97cb8bf89eae3363a9a"
                 }
               ]
             },
@@ -1445,7 +1564,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "52765372a9db3dd8d9c9e32d917d8edcfa8df53add0629b2b6361c347c1c255c"
+                      "bytes": "0ac13d181f25ac9e92a441ed516016e4e5f81a27d07ee97cb8bf89eae3363a9a"
                     }
                   ]
                 },
@@ -1470,7 +1589,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e4c578e4d580c12ecbc9ba23c165cfe8e002f3d75318e95c6cd189bf3409237a"
+                  "bytes": "11ab8cd5470283e5242efc1e49bbb1fae45370cdf4e356578d06ce5ba6d5b1e2"
                 }
               ]
             },
@@ -1490,7 +1609,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e4c578e4d580c12ecbc9ba23c165cfe8e002f3d75318e95c6cd189bf3409237a"
+                      "bytes": "11ab8cd5470283e5242efc1e49bbb1fae45370cdf4e356578d06ce5ba6d5b1e2"
                     }
                   ]
                 },
@@ -1505,6 +1624,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "75febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "75febdb69e7e838dc80210e2272c9ee25c918dad21f01a0c3db74a2e0f34ee64"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1889,6 +2110,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "1194852393571756375"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "1194852393571756375"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounding_on_odd_amounts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounding_on_odd_amounts.1.json
index bc389ad..e7a63f0 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounding_on_odd_amounts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounding_on_odd_amounts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "3f290e1556d6b3ff96733829d444131cc51a59c77ecbc92a85602661a6a23856"
+                  "bytes": "63a3b2ef5952c7d908ca551533de942b696cb86111b740cacba5158b3086bf07"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3f290e1556d6b3ff96733829d444131cc51a59c77ecbc92a85602661a6a23856"
+                  "bytes": "63a3b2ef5952c7d908ca551533de942b696cb86111b740cacba5158b3086bf07"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3f290e1556d6b3ff96733829d444131cc51a59c77ecbc92a85602661a6a23856"
+                      "bytes": "63a3b2ef5952c7d908ca551533de942b696cb86111b740cacba5158b3086bf07"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounds_down_non_divisible_amount.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounds_down_non_divisible_amount.1.json
index 8769430..22cba1c 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounds_down_non_divisible_amount.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/fee_rounds_down_non_divisible_amount.1.json
@@ -224,7 +224,7 @@
                   ]
                 },
                 {
-                  "bytes": "10eeff57ed48292e0c67c93a5c77b7e4df1f657de0879341b3e693ba8b474b55"
+                  "bytes": "6530be4f022eea7a25cb323db1549b31ed3dfd70891e5a7b9b7d713099a85da2"
                 }
               ]
             }
@@ -674,7 +674,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "10eeff57ed48292e0c67c93a5c77b7e4df1f657de0879341b3e693ba8b474b55"
+                  "bytes": "6530be4f022eea7a25cb323db1549b31ed3dfd70891e5a7b9b7d713099a85da2"
                 }
               ]
             },
@@ -694,7 +694,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "10eeff57ed48292e0c67c93a5c77b7e4df1f657de0879341b3e693ba8b474b55"
+                      "bytes": "6530be4f022eea7a25cb323db1549b31ed3dfd70891e5a7b9b7d713099a85da2"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/global_fee_bps_used_when_no_override.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/global_fee_bps_used_when_no_override.1.json
index b727bfa..641d1c1 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/global_fee_bps_used_when_no_override.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/global_fee_bps_used_when_no_override.1.json
@@ -224,7 +224,7 @@
                   ]
                 },
                 {
-                  "bytes": "10de2d51e249b547fff7c9f65ebe29feec96bd176075e50ea912556fb2de762f"
+                  "bytes": "0eaced2a3f0075ef91ef721a74f1c8bfeb82c224d814a00dcf6fa2b5a2451f1b"
                 }
               ]
             }
@@ -674,7 +674,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "10de2d51e249b547fff7c9f65ebe29feec96bd176075e50ea912556fb2de762f"
+                  "bytes": "0eaced2a3f0075ef91ef721a74f1c8bfeb82c224d814a00dcf6fa2b5a2451f1b"
                 }
               ]
             },
@@ -694,7 +694,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "10de2d51e249b547fff7c9f65ebe29feec96bd176075e50ea912556fb2de762f"
+                      "bytes": "0eaced2a3f0075ef91ef721a74f1c8bfeb82c224d814a00dcf6fa2b5a2451f1b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_double_claim_rejected.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_double_claim_rejected.1.json
index bb1127f..10f69e8 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_double_claim_rejected.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_double_claim_rejected.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "e2391fd0da9578cfd6555cce0631d261ab42af482d7f55cfd8a0bca823fd6f6e"
+                  "bytes": "f46d9932aeeeecc24e3196b03722f901bade1aa7fe7598c4c98ffc85545500a0"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "6c07f7a7310cb681e7b2a82e2c6f93e908e523be5fb91a800754864002c7bf52"
+                  "bytes": "042b834416ea85a43c9e2347f9ff37bf0efc3d13b502d58a313a5c3e4a9d6ae2"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "1118d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                  "bytes": "77aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                 }
               ]
             }
@@ -508,7 +508,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a118d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                  "bytes": "96aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                 }
               ]
             },
@@ -528,7 +528,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a118d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                      "bytes": "96aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                     }
                   ]
                 },
@@ -553,7 +553,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c018d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                  "bytes": "a6aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                 }
               ]
             },
@@ -573,7 +573,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c018d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                      "bytes": "a6aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                     }
                   ]
                 },
@@ -598,7 +598,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f018d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                  "bytes": "c7aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                 }
               ]
             },
@@ -618,7 +618,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f018d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                      "bytes": "c7aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                     }
                   ]
                 },
@@ -1293,7 +1293,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1118d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                  "bytes": "042b834416ea85a43c9e2347f9ff37bf0efc3d13b502d58a313a5c3e4a9d6ae2"
                 }
               ]
             },
@@ -1313,7 +1313,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1118d62620a19a5dd8f851925cb0163c4434491f2f93db4629ce06213a8580c6"
+                      "bytes": "042b834416ea85a43c9e2347f9ff37bf0efc3d13b502d58a313a5c3e4a9d6ae2"
                     }
                   ]
                 },
@@ -1338,7 +1338,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6c07f7a7310cb681e7b2a82e2c6f93e908e523be5fb91a800754864002c7bf52"
+                  "bytes": "77aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                 }
               ]
             },
@@ -1358,7 +1358,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6c07f7a7310cb681e7b2a82e2c6f93e908e523be5fb91a800754864002c7bf52"
+                      "bytes": "77aad6918732a68104caa566c8b1754000e6e66994b7739a63a2803689e3ec7c"
                     }
                   ]
                 },
@@ -1383,7 +1383,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e2391fd0da9578cfd6555cce0631d261ab42af482d7f55cfd8a0bca823fd6f6e"
+                  "bytes": "f46d9932aeeeecc24e3196b03722f901bade1aa7fe7598c4c98ffc85545500a0"
                 }
               ]
             },
@@ -1403,7 +1403,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e2391fd0da9578cfd6555cce0631d261ab42af482d7f55cfd8a0bca823fd6f6e"
+                      "bytes": "f46d9932aeeeecc24e3196b03722f901bade1aa7fe7598c4c98ffc85545500a0"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_out_of_range_rejected.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_out_of_range_rejected.1.json
index 61bac12..d3ff050 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_out_of_range_rejected.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_out_of_range_rejected.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "0e3415358c29b4b26d393d239d7bb3cc9ca0f2c80869f867ad0f1b7e94259c34"
+                  "bytes": "6bddd49463ecf17bc9fc2a5c72855db12d2202aecaa2efd73257b8bab2db7391"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "ba7953be744cfb8be8c8ca6b3fd2aef29342430ac54304754fb1b2caf494819d"
+                  "bytes": "e3a9494a70f8d440eb09429494155ffdd8ca77460dfa64fab393a87c24133ca1"
                 }
               ]
             }
@@ -865,7 +865,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0e3415358c29b4b26d393d239d7bb3cc9ca0f2c80869f867ad0f1b7e94259c34"
+                  "bytes": "6bddd49463ecf17bc9fc2a5c72855db12d2202aecaa2efd73257b8bab2db7391"
                 }
               ]
             },
@@ -885,7 +885,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0e3415358c29b4b26d393d239d7bb3cc9ca0f2c80869f867ad0f1b7e94259c34"
+                      "bytes": "6bddd49463ecf17bc9fc2a5c72855db12d2202aecaa2efd73257b8bab2db7391"
                     }
                   ]
                 },
@@ -910,7 +910,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ba7953be744cfb8be8c8ca6b3fd2aef29342430ac54304754fb1b2caf494819d"
+                  "bytes": "e3a9494a70f8d440eb09429494155ffdd8ca77460dfa64fab393a87c24133ca1"
                 }
               ]
             },
@@ -930,7 +930,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ba7953be744cfb8be8c8ca6b3fd2aef29342430ac54304754fb1b2caf494819d"
+                      "bytes": "e3a9494a70f8d440eb09429494155ffdd8ca77460dfa64fab393a87c24133ca1"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_pays_floored_per_milestone.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_pays_floored_per_milestone.1.json
index 2c12b8b..7e87cd9 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_pays_floored_per_milestone.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/grant_milestone_pays_floored_per_milestone.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "50d6900d274dfed942c87ebfeee890c8944ee994c883829fd05147bece12e93c"
+                  "bytes": "39adfd7181be59058e074c9a8f12b47d44278dc1a308adf537a188906571b852"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "604d73bd81737100a3237441355a5bcc9420fc20b3291b58508a551f8126d641"
+                  "bytes": "c4e3329ef371a9737945b722cae203151bd044d84ab41fdb216b4e15755d1bae"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "c7d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                  "bytes": "0f84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                 }
               ]
             }
@@ -364,7 +364,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "bd264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                  "bytes": "83a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                 }
               ]
             }
@@ -396,7 +396,7 @@
                   "u32": 50
                 },
                 {
-                  "bytes": "89ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                  "bytes": "d82175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                 }
               ]
             }
@@ -573,7 +573,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0d264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                  "bytes": "092175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                 }
               ]
             },
@@ -593,7 +593,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0d264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                      "bytes": "092175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                     }
                   ]
                 },
@@ -618,7 +618,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "16d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                  "bytes": "33a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                 }
               ]
             },
@@ -638,7 +638,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "16d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                      "bytes": "33a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                     }
                   ]
                 },
@@ -663,7 +663,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "26d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                  "bytes": "392175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                 }
               ]
             },
@@ -683,7 +683,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "26d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                      "bytes": "392175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                     }
                   ]
                 },
@@ -708,7 +708,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "39ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                  "bytes": "52a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                 }
               ]
             },
@@ -728,7 +728,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "39ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                      "bytes": "52a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                     }
                   ]
                 },
@@ -753,7 +753,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "58ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                  "bytes": "62a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                 }
               ]
             },
@@ -773,7 +773,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "58ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                      "bytes": "62a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                     }
                   ]
                 },
@@ -798,7 +798,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5c264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                  "bytes": "682175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                 }
               ]
             },
@@ -818,7 +818,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5c264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                      "bytes": "682175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                     }
                   ]
                 },
@@ -843,7 +843,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "68ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                  "bytes": "bf84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                 }
               ]
             },
@@ -863,7 +863,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "68ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                      "bytes": "bf84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                     }
                   ]
                 },
@@ -888,7 +888,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6c264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                  "bytes": "de84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                 }
               ]
             },
@@ -908,7 +908,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6c264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                      "bytes": "de84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                     }
                   ]
                 },
@@ -933,7 +933,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "77d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                  "bytes": "ee84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                 }
               ]
             },
@@ -953,7 +953,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "77d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                      "bytes": "ee84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                     }
                   ]
                 },
@@ -1926,7 +1926,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "50d6900d274dfed942c87ebfeee890c8944ee994c883829fd05147bece12e93c"
+                  "bytes": "0f84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                 }
               ]
             },
@@ -1946,7 +1946,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "50d6900d274dfed942c87ebfeee890c8944ee994c883829fd05147bece12e93c"
+                      "bytes": "0f84741d7f830de24f6b2b8eda8123f3c627166092035cd5b4427c4b740c196c"
                     }
                   ]
                 },
@@ -1971,7 +1971,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "604d73bd81737100a3237441355a5bcc9420fc20b3291b58508a551f8126d641"
+                  "bytes": "39adfd7181be59058e074c9a8f12b47d44278dc1a308adf537a188906571b852"
                 }
               ]
             },
@@ -1991,7 +1991,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "604d73bd81737100a3237441355a5bcc9420fc20b3291b58508a551f8126d641"
+                      "bytes": "39adfd7181be59058e074c9a8f12b47d44278dc1a308adf537a188906571b852"
                     }
                   ]
                 },
@@ -2016,7 +2016,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "89ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                  "bytes": "83a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                 }
               ]
             },
@@ -2036,7 +2036,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "89ba486523f891d3ec154941000a06f5ccee636b24414d3bde1226b21fab9f14"
+                      "bytes": "83a7fe08671f3252199cc39c0062d989d7b6b588096f84a0847b28525ffb6c01"
                     }
                   ]
                 },
@@ -2061,7 +2061,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bd264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                  "bytes": "c4e3329ef371a9737945b722cae203151bd044d84ab41fdb216b4e15755d1bae"
                 }
               ]
             },
@@ -2081,7 +2081,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bd264e57c201b38721444d861cf93488324938baa447cf9ab3231b3383205447"
+                      "bytes": "c4e3329ef371a9737945b722cae203151bd044d84ab41fdb216b4e15755d1bae"
                     }
                   ]
                 },
@@ -2106,7 +2106,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c7d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                  "bytes": "d82175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                 }
               ]
             },
@@ -2126,7 +2126,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c7d9cbcf2dbe6a82cee9fdb86484498c47722a36c82128c8349129b278035133"
+                      "bytes": "d82175f8f380f73202f36960f28e30210ae4b7463ea03fd9659f95c930aebc8f"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/large_budget_fee_does_not_overflow.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/large_budget_fee_does_not_overflow.1.json
index c32de35..27ea683 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/large_budget_fee_does_not_overflow.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/large_budget_fee_does_not_overflow.1.json
@@ -245,7 +245,7 @@
                   ]
                 },
                 {
-                  "bytes": "19c4a760452459cc018777302ce5c0ce2d3b89d42638b26f1c8348da99ad6473"
+                  "bytes": "c64892fdc4f24713549c72eebbabfecc251e7b2adb11b25f5f164be0a8357c20"
                 }
               ]
             }
@@ -694,7 +694,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "19c4a760452459cc018777302ce5c0ce2d3b89d42638b26f1c8348da99ad6473"
+                  "bytes": "c64892fdc4f24713549c72eebbabfecc251e7b2adb11b25f5f164be0a8357c20"
                 }
               ]
             },
@@ -714,7 +714,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "19c4a760452459cc018777302ce5c0ce2d3b89d42638b26f1c8348da99ad6473"
+                      "bytes": "c64892fdc4f24713549c72eebbabfecc251e7b2adb11b25f5f164be0a8357c20"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/mid_flight_global_bps_change_does_not_affect_override_event.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/mid_flight_global_bps_change_does_not_affect_override_event.1.json
index ef2d695..0893f8b 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/mid_flight_global_bps_change_does_not_affect_override_event.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/mid_flight_global_bps_change_does_not_affect_override_event.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "dcc5762a695c40fa0e30382f9815f6c86039a6d9a7bb2d058d83079ce39d1c3d"
+                  "bytes": "d1a3cfed8726ccce479ab44fa0b547e1fbdb76cb8b505691bcafa7da115d719a"
                 }
               ]
             }
@@ -316,7 +316,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "f9ca97ff23d437869c6f5886caae62abb184e4a4582af0c4102b5949d1065938"
+                  "bytes": "10edb2bf34edcf1e68b1e47bcc0bdc4fa0ab3a8c59ea437ffaaa8b980391c95c"
                 }
               ]
             }
@@ -998,7 +998,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dcc5762a695c40fa0e30382f9815f6c86039a6d9a7bb2d058d83079ce39d1c3d"
+                  "bytes": "10edb2bf34edcf1e68b1e47bcc0bdc4fa0ab3a8c59ea437ffaaa8b980391c95c"
                 }
               ]
             },
@@ -1018,7 +1018,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dcc5762a695c40fa0e30382f9815f6c86039a6d9a7bb2d058d83079ce39d1c3d"
+                      "bytes": "10edb2bf34edcf1e68b1e47bcc0bdc4fa0ab3a8c59ea437ffaaa8b980391c95c"
                     }
                   ]
                 },
@@ -1043,7 +1043,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f9ca97ff23d437869c6f5886caae62abb184e4a4582af0c4102b5949d1065938"
+                  "bytes": "d1a3cfed8726ccce479ab44fa0b547e1fbdb76cb8b505691bcafa7da115d719a"
                 }
               ]
             },
@@ -1063,7 +1063,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f9ca97ff23d437869c6f5886caae62abb184e4a4582af0c4102b5949d1065938"
+                      "bytes": "d1a3cfed8726ccce479ab44fa0b547e1fbdb76cb8b505691bcafa7da115d719a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/multi_position_split_pays_correct_amounts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/multi_position_split_pays_correct_amounts.1.json
index eebc064..8865255 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/multi_position_split_pays_correct_amounts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/multi_position_split_pays_correct_amounts.1.json
@@ -239,7 +239,7 @@
                   ]
                 },
                 {
-                  "bytes": "940c94486810258f87516af15a2099eb3360665a9951a7c28a143f04141c28bb"
+                  "bytes": "be78de0826e139adaf8c1b9688016985c2620806642d7f22be329cd8fa0acc51"
                 }
               ]
             }
@@ -370,7 +370,100 @@
                   ]
                 },
                 {
-                  "bytes": "b89a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "0c5d67c265f492f3120d124cebac339b1dd5df2693c2cbfb67d64932b61d31f5"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "7827a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 2
+                },
+                {
+                  "u32": 30
+                },
+                {
+                  "bytes": "fc8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 3
+                },
+                {
+                  "u32": 20
+                },
+                {
+                  "bytes": "96d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                 }
               ]
             }
@@ -651,7 +744,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "08980d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "1d8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
                 }
               ]
             },
@@ -671,7 +764,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "08980d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "1d8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
                     }
                   ]
                 },
@@ -696,7 +789,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "089a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "26d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                 }
               ]
             },
@@ -716,7 +809,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "089a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "26d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                     }
                   ]
                 },
@@ -741,7 +834,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "089b0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "2d8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
                 }
               ]
             },
@@ -761,7 +854,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "089b0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "2d8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
                     }
                   ]
                 },
@@ -786,7 +879,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "59980d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "47d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                 }
               ]
             },
@@ -806,7 +899,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "59980d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "47d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                     }
                   ]
                 },
@@ -831,7 +924,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "599a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "4c8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
                 }
               ]
             },
@@ -851,7 +944,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "599a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "4c8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
                     }
                   ]
                 },
@@ -876,7 +969,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "599b0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "77d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                 }
               ]
             },
@@ -896,7 +989,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "599b0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "77d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
                     }
                   ]
                 },
@@ -921,7 +1014,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "69980d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "9927a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
                 }
               ]
             },
@@ -941,7 +1034,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "69980d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "9927a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
                     }
                   ]
                 },
@@ -966,7 +1059,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "699a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "a927a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
                 }
               ]
             },
@@ -986,7 +1079,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "699a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "a927a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
                     }
                   ]
                 },
@@ -1011,7 +1104,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "699b0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "bytes": "c827a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
                 }
               ]
             },
@@ -1031,7 +1124,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "699b0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "bytes": "c827a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
                     }
                   ]
                 },
@@ -1612,9 +1705,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1702,9 +1793,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1792,9 +1881,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1828,10 +1915,13 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "EventWinnerCount"
+                  "symbol": "EventWinnerAt"
                 },
                 {
                   "u64": "1"
+                },
+                {
+                  "u32": 3
                 }
               ]
             },
@@ -1848,16 +1938,58 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "EventWinnerCount"
+                      "symbol": "EventWinnerAt"
                     },
                     {
                       "u64": "1"
+                    },
+                    {
+                      "u32": 3
                     }
                   ]
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 3
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "5000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
                 }
               }
             },
@@ -1873,14 +2005,17 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "OpSeen"
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
                 },
                 {
-                  "bytes": "940c94486810258f87516af15a2099eb3360665a9951a7c28a143f04141c28bb"
+                  "u32": 4
                 }
               ]
             },
-            "durability": "temporary"
+            "durability": "persistent"
           }
         },
         [
@@ -1893,22 +2028,64 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "OpSeen"
+                      "symbol": "EventWinnerAt"
                     },
                     {
-                      "bytes": "940c94486810258f87516af15a2099eb3360665a9951a7c28a143f04141c28bb"
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 4
                     }
                   ]
                 },
-                "durability": "temporary",
+                "durability": "persistent",
                 "val": {
-                  "bool": true
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "3000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 2
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
                 }
               }
             },
             "ext": "v0"
           },
-          15
+          1555200
         ]
       ],
       [
@@ -1918,14 +2095,17 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "OpSeen"
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
                 },
                 {
-                  "bytes": "b89a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                  "u32": 5
                 }
               ]
             },
-            "durability": "temporary"
+            "durability": "persistent"
           }
         },
         [
@@ -1938,22 +2118,505 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "OpSeen"
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
                     },
                     {
-                      "bytes": "b89a0d73433cdf01864f86e2a434aaa20cc45ee0f5a3db422f2db32d2d17e4e4"
+                      "u32": 5
                     }
                   ]
                 },
-                "durability": "temporary",
+                "durability": "persistent",
                 "val": {
-                  "bool": true
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "2000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 3
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                      }
+                    }
+                  ]
                 }
               }
             },
             "ext": "v0"
           },
-          15
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerCount"
+                },
+                {
+                  "u64": "1"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerCount"
+                    },
+                    {
+                      "u64": "1"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "u32": 6
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "0c5d67c265f492f3120d124cebac339b1dd5df2693c2cbfb67d64932b61d31f5"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "0c5d67c265f492f3120d124cebac339b1dd5df2693c2cbfb67d64932b61d31f5"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "7827a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "7827a10423e240a853d05f2cfd83ecf09842cb829bbcefd0aee720c00322dd56"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "96d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "96d17a9ccbbe321cb9ce6c55d8b5d3570c6e63e8867afd9791fa8337769a0b86"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "be78de0826e139adaf8c1b9688016985c2620806642d7f22be329cd8fa0acc51"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "be78de0826e139adaf8c1b9688016985c2620806642d7f22be329cd8fa0acc51"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "fc8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "fc8b4dd07a642588cfcb016826c5b61feae4538e69717f8aa7be38ae426ef03d"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 2
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 2
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 3
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                    },
+                    {
+                      "u32": 3
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
         ]
       ],
       [
@@ -2274,6 +2937,105 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "1194852393571756375"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "1194852393571756375"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/override_at_max_bps_boundary_succeeds.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/override_at_max_bps_boundary_succeeds.1.json
index 9379089..9f0c379 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/override_at_max_bps_boundary_succeeds.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/override_at_max_bps_boundary_succeeds.1.json
@@ -225,7 +225,7 @@
                   ]
                 },
                 {
-                  "bytes": "13a4cbfbef9b46c301ea42afcb55cfd06d4310ae02539b2dd4d048d73d00ef40"
+                  "bytes": "367651251d4a9e6e00f92b1f4bb012f2bdf789be4be0e7caff5ca9c2cccc876e"
                 }
               ]
             }
@@ -676,7 +676,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "13a4cbfbef9b46c301ea42afcb55cfd06d4310ae02539b2dd4d048d73d00ef40"
+                  "bytes": "367651251d4a9e6e00f92b1f4bb012f2bdf789be4be0e7caff5ca9c2cccc876e"
                 }
               ]
             },
@@ -696,7 +696,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "13a4cbfbef9b46c301ea42afcb55cfd06d4310ae02539b2dd4d048d73d00ef40"
+                      "bytes": "367651251d4a9e6e00f92b1f4bb012f2bdf789be4be0e7caff5ca9c2cccc876e"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/override_bps_used_on_create.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/override_bps_used_on_create.1.json
index 0bdb79c..401c09e 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/override_bps_used_on_create.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/override_bps_used_on_create.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "b5b03bbe0cfcd3cf689c7a1e91071636718a3326e38e9cf41c2a01415b893a41"
+                  "bytes": "b13e57a17c309d55defc6b70a26b9ad8a2fdd87235fa31d75a141630bca09871"
                 }
               ]
             }
@@ -678,7 +678,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b5b03bbe0cfcd3cf689c7a1e91071636718a3326e38e9cf41c2a01415b893a41"
+                  "bytes": "b13e57a17c309d55defc6b70a26b9ad8a2fdd87235fa31d75a141630bca09871"
                 }
               ]
             },
@@ -698,7 +698,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b5b03bbe0cfcd3cf689c7a1e91071636718a3326e38e9cf41c2a01415b893a41"
+                      "bytes": "b13e57a17c309d55defc6b70a26b9ad8a2fdd87235fa31d75a141630bca09871"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/partial_position_fill_leaves_residual_escrow.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/partial_position_fill_leaves_residual_escrow.1.json
index cbbe835..66061b3 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/partial_position_fill_leaves_residual_escrow.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/partial_position_fill_leaves_residual_escrow.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "006791fe1a1840451082b9595313955804d1eeeacbedc1aaee851971ac13d417"
+                  "bytes": "1cea2aceadfa7ae64ddc0cacfc09588fbbdfd86a11cea83a0f56234e3fe2cdfd"
                 }
               ]
             }
@@ -306,7 +306,38 @@
                   ]
                 },
                 {
-                  "bytes": "8addb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                  "bytes": "f2f93797bca151015bd6b0a37225fbb0f2345215220e3cb045172d9fe1b1f789"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "af62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                 }
               ]
             }
@@ -483,7 +514,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3addb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                  "bytes": "1f62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                 }
               ]
             },
@@ -503,7 +534,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3addb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                      "bytes": "1f62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                     }
                   ]
                 },
@@ -528,7 +559,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5bddb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                  "bytes": "4e62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                 }
               ]
             },
@@ -548,7 +579,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5bddb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                      "bytes": "4e62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                     }
                   ]
                 },
@@ -573,7 +604,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6bddb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                  "bytes": "7e62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                 }
               ]
             },
@@ -593,7 +624,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6bddb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                      "bytes": "7e62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                     }
                   ]
                 },
@@ -1022,6 +1053,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "6000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1107,7 +1226,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1126,7 +1245,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "006791fe1a1840451082b9595313955804d1eeeacbedc1aaee851971ac13d417"
+                  "bytes": "1cea2aceadfa7ae64ddc0cacfc09588fbbdfd86a11cea83a0f56234e3fe2cdfd"
                 }
               ]
             },
@@ -1146,7 +1265,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "006791fe1a1840451082b9595313955804d1eeeacbedc1aaee851971ac13d417"
+                      "bytes": "1cea2aceadfa7ae64ddc0cacfc09588fbbdfd86a11cea83a0f56234e3fe2cdfd"
                     }
                   ]
                 },
@@ -1171,7 +1290,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8addb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                  "bytes": "af62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                 }
               ]
             },
@@ -1191,7 +1310,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8addb067a722f2db0a64adf0a3765b120f1662a299be9ec10b4d0cdbcb333c8e"
+                      "bytes": "af62942b53c1adef3444743efc8ba7c462631d1525ad574785a8e05bd3917fc0"
                     }
                   ]
                 },
@@ -1206,6 +1325,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "f2f93797bca151015bd6b0a37225fbb0f2345215220e3cb045172d9fe1b1f789"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "f2f93797bca151015bd6b0a37225fbb0f2345215220e3cb045172d9fe1b1f789"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1524,6 +1745,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/partner_funds_grow_winner_payout.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/partner_funds_grow_winner_payout.1.json
index 7e1ba7e..7616341 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/partner_funds_grow_winner_payout.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/partner_funds_grow_winner_payout.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "819e89ba138d034c2ec5608806cb218c7dd3fa74738354039a0bb6a6711f5a27"
+                  "bytes": "c17e73d7a50b7347d7ef3a12a59a9a997698514a5fa2129929e3092856e7aa78"
                 }
               ]
             }
@@ -294,7 +294,7 @@
                   "i128": "5000000000"
                 },
                 {
-                  "bytes": "2d1b8450cc688768407b88173a708634ec295e11fc446588ee3cc8988df27b06"
+                  "bytes": "c532f295b496e2a211973d2cd79bd6b9831a9c7b5970e96f8a47c50962c7a012"
                 }
               ]
             }
@@ -370,7 +370,38 @@
                   ]
                 },
                 {
-                  "bytes": "586d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                  "bytes": "788b0a6a9c0d2372ea7fa669695224b42d14ea6856df6eba81a360e5f90925b6"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "508176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                 }
               ]
             }
@@ -546,7 +577,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "896d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                  "bytes": "818176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                 }
               ]
             },
@@ -566,7 +597,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "896d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                      "bytes": "818176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                     }
                   ]
                 },
@@ -591,7 +622,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b96d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                  "bytes": "b18176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                 }
               ]
             },
@@ -611,7 +642,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b96d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                      "bytes": "b18176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                     }
                   ]
                 },
@@ -636,7 +667,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e86d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                  "bytes": "e08176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                 }
               ]
             },
@@ -656,7 +687,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e86d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                      "bytes": "e08176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                     }
                   ]
                 },
@@ -1275,6 +1306,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "15000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1360,7 +1479,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1379,7 +1498,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2d1b8450cc688768407b88173a708634ec295e11fc446588ee3cc8988df27b06"
+                  "bytes": "508176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                 }
               ]
             },
@@ -1399,7 +1518,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2d1b8450cc688768407b88173a708634ec295e11fc446588ee3cc8988df27b06"
+                      "bytes": "508176df2258794ea8eafe5d9d006d7ee00cb12ac3faa20c2c5b68a4de99d496"
                     }
                   ]
                 },
@@ -1424,7 +1543,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "586d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                  "bytes": "788b0a6a9c0d2372ea7fa669695224b42d14ea6856df6eba81a360e5f90925b6"
                 }
               ]
             },
@@ -1444,7 +1563,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "586d56956cdc692fa44e224834aea40e8319fe9671673747eec5850bf5735981"
+                      "bytes": "788b0a6a9c0d2372ea7fa669695224b42d14ea6856df6eba81a360e5f90925b6"
                     }
                   ]
                 },
@@ -1469,7 +1588,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "819e89ba138d034c2ec5608806cb218c7dd3fa74738354039a0bb6a6711f5a27"
+                  "bytes": "c17e73d7a50b7347d7ef3a12a59a9a997698514a5fa2129929e3092856e7aa78"
                 }
               ]
             },
@@ -1489,7 +1608,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "819e89ba138d034c2ec5608806cb218c7dd3fa74738354039a0bb6a6711f5a27"
+                      "bytes": "c17e73d7a50b7347d7ef3a12a59a9a997698514a5fa2129929e3092856e7aa78"
                     }
                   ]
                 },
@@ -1504,6 +1623,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "c532f295b496e2a211973d2cd79bd6b9831a9c7b5970e96f8a47c50962c7a012"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "c532f295b496e2a211973d2cd79bd6b9831a9c7b5970e96f8a47c50962c7a012"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1888,6 +2109,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "1194852393571756375"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "1194852393571756375"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_create_event_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_create_event_reverts.1.json
index 6cc4a79..25667fa 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_create_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_create_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "70ccc51f3ce2e1a30d83f61d7d87f8dcab9f543ed84578f2275d4c812a609e4f"
+                  "bytes": "f49787d2bd35c35ed7ab538c69ca568f82cff2ed2713eae00b55849dbcc2c45e"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "70ccc51f3ce2e1a30d83f61d7d87f8dcab9f543ed84578f2275d4c812a609e4f"
+                  "bytes": "f49787d2bd35c35ed7ab538c69ca568f82cff2ed2713eae00b55849dbcc2c45e"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "70ccc51f3ce2e1a30d83f61d7d87f8dcab9f543ed84578f2275d4c812a609e4f"
+                      "bytes": "f49787d2bd35c35ed7ab538c69ca568f82cff2ed2713eae00b55849dbcc2c45e"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_select_winners_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_select_winners_reverts.1.json
index f6e30f8..3db46a7 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_select_winners_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/replayed_select_winners_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "c23bfc7dacda585ec5252dd5ba80189177af8ecf334e4bf895b339d82fd251cd"
+                  "bytes": "55d076dda9e69e008c9660380964d6786370cc0b4508614f0d0557fc04a56840"
                 }
               ]
             }
@@ -298,7 +298,7 @@
                   ]
                 },
                 {
-                  "bytes": "fe9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
+                  "bytes": "a6d281a615ceda2bed26b6e1aa19edd155f3070a1d5185a5cf5d9d954e6eba79"
                 }
               ]
             }
@@ -413,254 +413,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "10000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "1f9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "1f9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "2f9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "2f9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "4e9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "4e9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "50"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -899,7 +651,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "10000000000"
                       }
                     },
                     {
@@ -909,7 +661,7 @@
                       "val": {
                         "vec": [
                           {
-                            "symbol": "Completed"
+                            "symbol": "Active"
                           }
                         ]
                       }
@@ -1025,9 +777,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1109,7 +859,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c23bfc7dacda585ec5252dd5ba80189177af8ecf334e4bf895b339d82fd251cd"
+                  "bytes": "55d076dda9e69e008c9660380964d6786370cc0b4508614f0d0557fc04a56840"
                 }
               ]
             },
@@ -1129,7 +879,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c23bfc7dacda585ec5252dd5ba80189177af8ecf334e4bf895b339d82fd251cd"
+                      "bytes": "55d076dda9e69e008c9660380964d6786370cc0b4508614f0d0557fc04a56840"
                     }
                   ]
                 },
@@ -1154,7 +904,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "fe9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
+                  "bytes": "a6d281a615ceda2bed26b6e1aa19edd155f3070a1d5185a5cf5d9d954e6eba79"
                 }
               ]
             },
@@ -1174,7 +924,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "fe9d019c842b22d703b7acf2c77adc88d876695dcab2658aadb2bd593bc83b08"
+                      "bytes": "a6d281a615ceda2bed26b6e1aa19edd155f3070a1d5185a5cf5d9d954e6eba79"
                     }
                   ]
                 },
@@ -1619,7 +1369,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "10000000000"
                       }
                     },
                     {
@@ -1717,76 +1467,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "10000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_duplicate_position_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_duplicate_position_reverts.1.json
index c9deeab..2ac7258 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_duplicate_position_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_duplicate_position_reverts.1.json
@@ -231,7 +231,7 @@
                   ]
                 },
                 {
-                  "bytes": "58141fa8857abdb8b9d7f128f3303797a67103d7e18668564d760f50211e7f73"
+                  "bytes": "e6680381ae02085f8d91c7b3e666bc353a5045fb169d3ce0a6a125b374b91075"
                 }
               ]
             }
@@ -688,7 +688,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "58141fa8857abdb8b9d7f128f3303797a67103d7e18668564d760f50211e7f73"
+                  "bytes": "e6680381ae02085f8d91c7b3e666bc353a5045fb169d3ce0a6a125b374b91075"
                 }
               ]
             },
@@ -708,7 +708,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "58141fa8857abdb8b9d7f128f3303797a67103d7e18668564d760f50211e7f73"
+                      "bytes": "e6680381ae02085f8d91c7b3e666bc353a5045fb169d3ce0a6a125b374b91075"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_empty_list_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_empty_list_reverts.1.json
index 9a9b610..d569bc2 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_empty_list_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_empty_list_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "f9cb9e28655f738c377d8473d206cc4820753708bd2558fa02006874040e30ed"
+                  "bytes": "d3c2e8451ea4d1ffdf41e6217440d3707c1f1781f4f0b6a67f8a1d9056b41a9f"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f9cb9e28655f738c377d8473d206cc4820753708bd2558fa02006874040e30ed"
+                  "bytes": "d3c2e8451ea4d1ffdf41e6217440d3707c1f1781f4f0b6a67f8a1d9056b41a9f"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f9cb9e28655f738c377d8473d206cc4820753708bd2558fa02006874040e30ed"
+                      "bytes": "d3c2e8451ea4d1ffdf41e6217440d3707c1f1781f4f0b6a67f8a1d9056b41a9f"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_invalid_position_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_invalid_position_reverts.1.json
index a8d4254..5fccf3f 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_invalid_position_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_invalid_position_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "d708f65037bae75f000912ab7fb7614501bbb1fc772b21710e17ae23ff7d450d"
+                  "bytes": "3a645337ce875a0e659a55214dfe2cfcda86483231bcafa645096e1669473489"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d708f65037bae75f000912ab7fb7614501bbb1fc772b21710e17ae23ff7d450d"
+                  "bytes": "3a645337ce875a0e659a55214dfe2cfcda86483231bcafa645096e1669473489"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d708f65037bae75f000912ab7fb7614501bbb1fc772b21710e17ae23ff7d450d"
+                      "bytes": "3a645337ce875a0e659a55214dfe2cfcda86483231bcafa645096e1669473489"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_on_cancelled_event_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_on_cancelled_event_reverts.1.json
index a4c4791..a822bdd 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_on_cancelled_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_on_cancelled_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "218c6d591dd9496e2ae148956603b8c4119ffc06a646cc84df4e5827603f9ff6"
+                  "bytes": "8912b9eb62d464524413f367ec6f57c17289ae9b6b1f99c1d07b7471c7d61100"
                 }
               ]
             }
@@ -266,7 +266,7 @@
                   "u64": "1"
                 },
                 {
-                  "bytes": "f7b744ce566c22366638df6e2d5f715db756a81814c5e70aaa361eac7d52aa0c"
+                  "bytes": "c5ff1cf727002085d79a4dfab147c64241d0bb753eb8bd24d06e34cd36f6adff"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "218c6d591dd9496e2ae148956603b8c4119ffc06a646cc84df4e5827603f9ff6"
+                  "bytes": "8912b9eb62d464524413f367ec6f57c17289ae9b6b1f99c1d07b7471c7d61100"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "218c6d591dd9496e2ae148956603b8c4119ffc06a646cc84df4e5827603f9ff6"
+                      "bytes": "8912b9eb62d464524413f367ec6f57c17289ae9b6b1f99c1d07b7471c7d61100"
                     }
                   ]
                 },
@@ -740,7 +740,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f7b744ce566c22366638df6e2d5f715db756a81814c5e70aaa361eac7d52aa0c"
+                  "bytes": "c5ff1cf727002085d79a4dfab147c64241d0bb753eb8bd24d06e34cd36f6adff"
                 }
               ]
             },
@@ -760,7 +760,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f7b744ce566c22366638df6e2d5f715db756a81814c5e70aaa361eac7d52aa0c"
+                      "bytes": "c5ff1cf727002085d79a4dfab147c64241d0bb753eb8bd24d06e34cd36f6adff"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_twice_reverts.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_twice_reverts.1.json
index cc8ac46..25281f3 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_twice_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/select_winners_twice_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "55f3007942fb08ea73180253e95633924feb21ae43cce9e14f4dcb35933696f3"
+                  "bytes": "e8dc5cb32a814abbf839256b29abfc3a21ca17f8a86e1ad32677e9b7f6be06c7"
                 }
               ]
             }
@@ -298,7 +298,7 @@
                   ]
                 },
                 {
-                  "bytes": "e96c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
+                  "bytes": "84e0f59ed0a5f0815924c2e27cb809c90b3d2bd9b2bc57194638c9e761f5f17b"
                 }
               ]
             }
@@ -413,254 +413,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "10000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "086c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "086c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "386c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "386c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "596c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "596c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "50"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -899,7 +651,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "10000000000"
                       }
                     },
                     {
@@ -909,7 +661,7 @@
                       "val": {
                         "vec": [
                           {
-                            "symbol": "Completed"
+                            "symbol": "Active"
                           }
                         ]
                       }
@@ -1025,9 +777,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1109,7 +859,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "55f3007942fb08ea73180253e95633924feb21ae43cce9e14f4dcb35933696f3"
+                  "bytes": "84e0f59ed0a5f0815924c2e27cb809c90b3d2bd9b2bc57194638c9e761f5f17b"
                 }
               ]
             },
@@ -1129,7 +879,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "55f3007942fb08ea73180253e95633924feb21ae43cce9e14f4dcb35933696f3"
+                      "bytes": "84e0f59ed0a5f0815924c2e27cb809c90b3d2bd9b2bc57194638c9e761f5f17b"
                     }
                   ]
                 },
@@ -1154,7 +904,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e96c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
+                  "bytes": "e8dc5cb32a814abbf839256b29abfc3a21ca17f8a86e1ad32677e9b7f6be06c7"
                 }
               ]
             },
@@ -1174,7 +924,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e96c250a822bd6e733b6eedc88fbd7f3a76e3ecdde42c6c39f91a0d25d19a0fc"
+                      "bytes": "e8dc5cb32a814abbf839256b29abfc3a21ca17f8a86e1ad32677e9b7f6be06c7"
                     }
                   ]
                 },
@@ -1619,7 +1369,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "10000000000"
                       }
                     },
                     {
@@ -1717,76 +1467,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "10000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/single_release_pays_full_escrow_for_100_percent.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/single_release_pays_full_escrow_for_100_percent.1.json
index 3955eca..dd8b032 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/single_release_pays_full_escrow_for_100_percent.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/single_release_pays_full_escrow_for_100_percent.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "c07616f859c6c8266aba12c7db582d12f847cec25d2b558f53491d614ede1f22"
+                  "bytes": "2d847f912e10b45f2b8c57922910809cb60b0c5474f31d833298af5c72e26db6"
                 }
               ]
             }
@@ -298,7 +298,38 @@
                   ]
                 },
                 {
-                  "bytes": "def6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                  "bytes": "4d52e48c249c85e8c92db708e9069098d69e220b5cff17f4d120d64995496173"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "6e6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                 }
               ]
             }
@@ -475,7 +506,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0ff6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                  "bytes": "8f6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                 }
               ]
             },
@@ -495,7 +526,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0ff6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                      "bytes": "8f6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                     }
                   ]
                 },
@@ -520,7 +551,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3ff6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                  "bytes": "bf6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                 }
               ]
             },
@@ -540,7 +571,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3ff6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                      "bytes": "bf6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                     }
                   ]
                 },
@@ -565,7 +596,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6ef6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                  "bytes": "de6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                 }
               ]
             },
@@ -585,7 +616,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6ef6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                      "bytes": "de6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
                     }
                   ]
                 },
@@ -1006,6 +1037,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "10000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1091,7 +1210,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1110,7 +1229,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c07616f859c6c8266aba12c7db582d12f847cec25d2b558f53491d614ede1f22"
+                  "bytes": "2d847f912e10b45f2b8c57922910809cb60b0c5474f31d833298af5c72e26db6"
                 }
               ]
             },
@@ -1130,7 +1249,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c07616f859c6c8266aba12c7db582d12f847cec25d2b558f53491d614ede1f22"
+                      "bytes": "2d847f912e10b45f2b8c57922910809cb60b0c5474f31d833298af5c72e26db6"
                     }
                   ]
                 },
@@ -1155,7 +1274,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "def6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                  "bytes": "4d52e48c249c85e8c92db708e9069098d69e220b5cff17f4d120d64995496173"
                 }
               ]
             },
@@ -1175,7 +1294,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "def6bd7c7293eb7b4d8a6a9b7398b6d006537e4be1211b458f9974c7bbf00ba1"
+                      "bytes": "4d52e48c249c85e8c92db708e9069098d69e220b5cff17f4d120d64995496173"
                     }
                   ]
                 },
@@ -1190,6 +1309,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "6e6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "6e6f5fdd585cdbe97517e564ed74797cf4afadd1fb56796efd2c9c5fc52d62f7"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1508,6 +1729,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/three_way_33_33_34_split_rounding.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/three_way_33_33_34_split_rounding.1.json
index fdb80cb..82e0701 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/three_way_33_33_34_split_rounding.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/three_way_33_33_34_split_rounding.1.json
@@ -239,7 +239,7 @@
                   ]
                 },
                 {
-                  "bytes": "8d88be9c4d83bac5e7fab985aca2fc9d785bc0137484ebbfb45b0f705759a3a7"
+                  "bytes": "5eb831a7ccc1ced3e9c407c9e28e4e425502cab1e05061f7d48681ab947c7854"
                 }
               ]
             }
@@ -370,7 +370,100 @@
                   ]
                 },
                 {
-                  "bytes": "73f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "e3219a48a3873f8cc9409179a5dcf972e4381fb8b13df6938140ad2941e85cdc"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "3af9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 2
+                },
+                {
+                  "u32": 30
+                },
+                {
+                  "bytes": "d9a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 3
+                },
+                {
+                  "u32": 20
+                },
+                {
+                  "bytes": "b0b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                 }
               ]
             }
@@ -651,7 +744,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "92f831eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "00b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                 }
               ]
             },
@@ -671,7 +764,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "92f831eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "00b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                     }
                   ]
                 },
@@ -696,7 +789,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "92f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "08a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
                 }
               ]
             },
@@ -716,7 +809,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "92f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "08a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
                     }
                   ]
                 },
@@ -741,7 +834,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "92fb31eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "38a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
                 }
               ]
             },
@@ -761,7 +854,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "92fb31eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "38a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
                     }
                   ]
                 },
@@ -786,7 +879,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a2f831eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "51b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                 }
               ]
             },
@@ -806,7 +899,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a2f831eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "51b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                     }
                   ]
                 },
@@ -831,7 +924,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a2f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "61b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                 }
               ]
             },
@@ -851,7 +944,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a2f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "61b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
                     }
                   ]
                 },
@@ -876,7 +969,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a2fb31eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "69a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
                 }
               ]
             },
@@ -896,7 +989,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a2fb31eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "69a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
                     }
                   ]
                 },
@@ -921,7 +1014,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c3f831eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "8af9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
                 }
               ]
             },
@@ -941,7 +1034,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c3f831eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "8af9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
                     }
                   ]
                 },
@@ -966,7 +1059,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c3f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "dbf9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
                 }
               ]
             },
@@ -986,7 +1079,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c3f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "dbf9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
                     }
                   ]
                 },
@@ -1011,7 +1104,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c3fb31eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "bytes": "ebf9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
                 }
               ]
             },
@@ -1031,7 +1124,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c3fb31eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "bytes": "ebf9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
                     }
                   ]
                 },
@@ -1612,9 +1705,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1702,9 +1793,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1792,9 +1881,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1828,10 +1915,13 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "EventWinnerCount"
+                  "symbol": "EventWinnerAt"
                 },
                 {
                   "u64": "1"
+                },
+                {
+                  "u32": 3
                 }
               ]
             },
@@ -1848,16 +1938,58 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "EventWinnerCount"
+                      "symbol": "EventWinnerAt"
                     },
                     {
                       "u64": "1"
+                    },
+                    {
+                      "u32": 3
                     }
                   ]
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 3
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "3300000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
                 }
               }
             },
@@ -1873,14 +2005,17 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "OpSeen"
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
                 },
                 {
-                  "bytes": "73f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                  "u32": 4
                 }
               ]
             },
-            "durability": "temporary"
+            "durability": "persistent"
           }
         },
         [
@@ -1893,22 +2028,64 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "OpSeen"
+                      "symbol": "EventWinnerAt"
                     },
                     {
-                      "bytes": "73f931eebe02457774ee1d9f43ef6eb5748b9f15126b4b65defb5a3266bde35b"
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 4
                     }
                   ]
                 },
-                "durability": "temporary",
+                "durability": "persistent",
                 "val": {
-                  "bool": true
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "3300000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 2
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
                 }
               }
             },
             "ext": "v0"
           },
-          15
+          1555200
         ]
       ],
       [
@@ -1918,14 +2095,17 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "OpSeen"
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
                 },
                 {
-                  "bytes": "8d88be9c4d83bac5e7fab985aca2fc9d785bc0137484ebbfb45b0f705759a3a7"
+                  "u32": 5
                 }
               ]
             },
-            "durability": "temporary"
+            "durability": "persistent"
           }
         },
         [
@@ -1938,22 +2118,505 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "OpSeen"
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
                     },
                     {
-                      "bytes": "8d88be9c4d83bac5e7fab985aca2fc9d785bc0137484ebbfb45b0f705759a3a7"
+                      "u32": 5
                     }
                   ]
                 },
-                "durability": "temporary",
+                "durability": "persistent",
                 "val": {
-                  "bool": true
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "3400000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 3
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                      }
+                    }
+                  ]
                 }
               }
             },
             "ext": "v0"
           },
-          15
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerCount"
+                },
+                {
+                  "u64": "1"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerCount"
+                    },
+                    {
+                      "u64": "1"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "u32": 6
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "3af9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "3af9ad126f7c667a85efb289d7d4bb137f678dbcebca8f91d5f36087755222e7"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "5eb831a7ccc1ced3e9c407c9e28e4e425502cab1e05061f7d48681ab947c7854"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "5eb831a7ccc1ced3e9c407c9e28e4e425502cab1e05061f7d48681ab947c7854"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "b0b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "b0b8ea664c6a6b6ad6d2b60b433eb68e629d42c11fdc81e681ec5c7858c20919"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "d9a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "d9a64cf88d28d5dc381b68e50e6bd0cfa15acd2c7a592bc60c378f0a626bb2ef"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "e3219a48a3873f8cc9409179a5dcf972e4381fb8b13df6938140ad2941e85cdc"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "e3219a48a3873f8cc9409179a5dcf972e4381fb8b13df6938140ad2941e85cdc"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 2
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 2
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 3
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                    },
+                    {
+                      "u32": 3
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
         ]
       ],
       [
@@ -2274,6 +2937,105 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "1194852393571756375"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "1194852393571756375"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/zero_global_bps_no_override_charges_no_fee.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/zero_global_bps_no_override_charges_no_fee.1.json
index 69b0df9..6042344 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/zero_global_bps_no_override_charges_no_fee.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/zero_global_bps_no_override_charges_no_fee.1.json
@@ -224,7 +224,7 @@
                   ]
                 },
                 {
-                  "bytes": "833bd5b324a4d40a015494c5aa414450f4e6a1aead6389b6b7ae380bb3c7ed54"
+                  "bytes": "28cce08f503cc63e408488e4ef8c6fd8a77e7a1a38fd0244b854c2c622e4c449"
                 }
               ]
             }
@@ -674,7 +674,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "833bd5b324a4d40a015494c5aa414450f4e6a1aead6389b6b7ae380bb3c7ed54"
+                  "bytes": "28cce08f503cc63e408488e4ef8c6fd8a77e7a1a38fd0244b854c2c622e4c449"
                 }
               ]
             },
@@ -694,7 +694,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "833bd5b324a4d40a015494c5aa414450f4e6a1aead6389b6b7ae380bb3c7ed54"
+                      "bytes": "28cce08f503cc63e408488e4ef8c6fd8a77e7a1a38fd0244b854c2c622e4c449"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/escrow_fee_math/zero_override_bps_skips_fee.1.json b/contracts/events/test_snapshots/tests/escrow_fee_math/zero_override_bps_skips_fee.1.json
index 27acf98..68c573c 100644
--- a/contracts/events/test_snapshots/tests/escrow_fee_math/zero_override_bps_skips_fee.1.json
+++ b/contracts/events/test_snapshots/tests/escrow_fee_math/zero_override_bps_skips_fee.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "59a14cac425b72ff6d45fc91ce55db8d867f5c42cf00568ea6282437b4f20b50"
+                  "bytes": "649dba103f6aec8be1eb4bedcd51b2f512f77a81fce6c86eb5579e815ca151c5"
                 }
               ]
             }
@@ -678,7 +678,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "59a14cac425b72ff6d45fc91ce55db8d867f5c42cf00568ea6282437b4f20b50"
+                  "bytes": "649dba103f6aec8be1eb4bedcd51b2f512f77a81fce6c86eb5579e815ca151c5"
                 }
               ]
             },
@@ -698,7 +698,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "59a14cac425b72ff6d45fc91ce55db8d867f5c42cf00568ea6282437b4f20b50"
+                      "bytes": "649dba103f6aec8be1eb4bedcd51b2f512f77a81fce6c86eb5579e815ca151c5"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_already_claimed_reverts.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_already_claimed_reverts.1.json
index 57dab51..d1b1f10 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_already_claimed_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_already_claimed_reverts.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "cde2ab9a847d42ce117ede6e9b9a4e2a54322f6e621b5cb37b783529e651b5f2"
+                  "bytes": "225728a29d2e157d95dcd063211ee11886711ff06b654e802a59e2699b063dad"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "8389174a851783da51e0ad5535ee027f044e1b532a82f8cb51aabc6f6d9f13cf"
+                  "bytes": "1762681f56d5e87c907643cad6d82f94fa12249046a9fba90f29505d0c01f550"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "f855a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                  "bytes": "4af13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                 }
               ]
             }
@@ -508,7 +508,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1955a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                  "bytes": "9bf13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                 }
               ]
             },
@@ -528,7 +528,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1955a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                      "bytes": "9bf13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                     }
                   ]
                 },
@@ -553,7 +553,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2955a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                  "bytes": "abf13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                 }
               ]
             },
@@ -573,7 +573,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2955a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                      "bytes": "abf13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                     }
                   ]
                 },
@@ -598,7 +598,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4855a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                  "bytes": "faf13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                 }
               ]
             },
@@ -618,7 +618,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4855a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                      "bytes": "faf13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                     }
                   ]
                 },
@@ -1293,7 +1293,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8389174a851783da51e0ad5535ee027f044e1b532a82f8cb51aabc6f6d9f13cf"
+                  "bytes": "1762681f56d5e87c907643cad6d82f94fa12249046a9fba90f29505d0c01f550"
                 }
               ]
             },
@@ -1313,7 +1313,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8389174a851783da51e0ad5535ee027f044e1b532a82f8cb51aabc6f6d9f13cf"
+                      "bytes": "1762681f56d5e87c907643cad6d82f94fa12249046a9fba90f29505d0c01f550"
                     }
                   ]
                 },
@@ -1338,7 +1338,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cde2ab9a847d42ce117ede6e9b9a4e2a54322f6e621b5cb37b783529e651b5f2"
+                  "bytes": "225728a29d2e157d95dcd063211ee11886711ff06b654e802a59e2699b063dad"
                 }
               ]
             },
@@ -1358,7 +1358,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cde2ab9a847d42ce117ede6e9b9a4e2a54322f6e621b5cb37b783529e651b5f2"
+                      "bytes": "225728a29d2e157d95dcd063211ee11886711ff06b654e802a59e2699b063dad"
                     }
                   ]
                 },
@@ -1383,7 +1383,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f855a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                  "bytes": "4af13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                 }
               ]
             },
@@ -1403,7 +1403,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f855a1226845a5b44f0be2e78b3e48dd5412361f6914f4a2654d9b7e2fbf3660"
+                      "bytes": "4af13766ecee0efbb90dfb01e5fe5ea85dad2ca2008eabcf732ff55586241ff0"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_earns_credits_and_bumps_reputation.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_earns_credits_and_bumps_reputation.1.json
index 599ef81..87ccc9d 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_earns_credits_and_bumps_reputation.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_earns_credits_and_bumps_reputation.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "696f329eb9e1aa4a42feaa26f3e5c555e39ae409223393487a3f2b4b9b15be02"
+                  "bytes": "67a8f009d305a6fe640898509c7dffda42589f5876c0f7a4894ff9e6884c199a"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "79f6c8bf444f0db6ab76dca450321a06ae879111670d3fb6c4145ad7146aecea"
+                  "bytes": "3af6c5ce9158b033c9d63a73329b81de4cc1dec2d9622b98a8a68033bb4b4ad8"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 10
                 },
                 {
-                  "bytes": "65bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                  "bytes": "19a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                 }
               ]
             }
@@ -509,7 +509,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "84bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                  "bytes": "a9a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                 }
               ]
             },
@@ -529,7 +529,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "84bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                      "bytes": "a9a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                     }
                   ]
                 },
@@ -554,7 +554,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b4bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                  "bytes": "c8a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                 }
               ]
             },
@@ -574,7 +574,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b4bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                      "bytes": "c8a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                     }
                   ]
                 },
@@ -599,7 +599,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d5bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                  "bytes": "f8a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                 }
               ]
             },
@@ -619,7 +619,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d5bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                      "bytes": "f8a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                     }
                   ]
                 },
@@ -1294,7 +1294,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "65bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                  "bytes": "19a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                 }
               ]
             },
@@ -1314,7 +1314,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "65bad803d544a369804ec5d6f618fa599cf53528150a32353f7a744db41ae930"
+                      "bytes": "19a258b44af6bcb0ff69cffedfa0d8985f0d0fbabe3b66e8240dabec24f46cd9"
                     }
                   ]
                 },
@@ -1339,7 +1339,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "696f329eb9e1aa4a42feaa26f3e5c555e39ae409223393487a3f2b4b9b15be02"
+                  "bytes": "3af6c5ce9158b033c9d63a73329b81de4cc1dec2d9622b98a8a68033bb4b4ad8"
                 }
               ]
             },
@@ -1359,7 +1359,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "696f329eb9e1aa4a42feaa26f3e5c555e39ae409223393487a3f2b4b9b15be02"
+                      "bytes": "3af6c5ce9158b033c9d63a73329b81de4cc1dec2d9622b98a8a68033bb4b4ad8"
                     }
                   ]
                 },
@@ -1384,7 +1384,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "79f6c8bf444f0db6ab76dca450321a06ae879111670d3fb6c4145ad7146aecea"
+                  "bytes": "67a8f009d305a6fe640898509c7dffda42589f5876c0f7a4894ff9e6884c199a"
                 }
               ]
             },
@@ -1404,7 +1404,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "79f6c8bf444f0db6ab76dca450321a06ae879111670d3fb6c4145ad7146aecea"
+                      "bytes": "67a8f009d305a6fe640898509c7dffda42589f5876c0f7a4894ff9e6884c199a"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_last_sweeps_rounding_residue.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_last_sweeps_rounding_residue.1.json
index c68395a..15799f5 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_last_sweeps_rounding_residue.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_last_sweeps_rounding_residue.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "352f42f070531b6a7c02f779ac9763d95e473db084a4047c3dad97043621196c"
+                  "bytes": "6a74ea992c2d99109b2922bdeeac5694c3cc1198eeb20b01faf405e86276af34"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "92e26bc133340a26f8099ef5b08602bc8224767c515f665b2f1b8b69e8b13ead"
+                  "bytes": "bc54c40bb2aeb5808a0c128a4fa82d968f810874f45a650c62ddbf4c711a983f"
                 }
               ]
             }
@@ -334,7 +334,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "12b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                  "bytes": "129c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                 }
               ]
             }
@@ -365,7 +365,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "ef4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                  "bytes": "f1ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                 }
               ]
             }
@@ -397,7 +397,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "f93efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                  "bytes": "d66f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                 }
               ]
             }
@@ -575,7 +575,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0e4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                  "bytes": "076f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                 }
               ]
             },
@@ -595,7 +595,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0e4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                      "bytes": "076f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                     }
                   ]
                 },
@@ -620,7 +620,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "183efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                  "bytes": "10ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                 }
               ]
             },
@@ -640,7 +640,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "183efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                      "bytes": "10ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                     }
                   ]
                 },
@@ -665,7 +665,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "283efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                  "bytes": "20ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                 }
               ]
             },
@@ -685,7 +685,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "283efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                      "bytes": "20ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                     }
                   ]
                 },
@@ -710,7 +710,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3e4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                  "bytes": "376f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                 }
               ]
             },
@@ -730,7 +730,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3e4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                      "bytes": "376f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                     }
                   ]
                 },
@@ -755,7 +755,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "493efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                  "bytes": "41ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                 }
               ]
             },
@@ -775,7 +775,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "493efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                      "bytes": "41ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                     }
                   ]
                 },
@@ -800,7 +800,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5f4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                  "bytes": "666f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                 }
               ]
             },
@@ -820,7 +820,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5f4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                      "bytes": "666f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                     }
                   ]
                 },
@@ -845,7 +845,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a2b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                  "bytes": "a29c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                 }
               ]
             },
@@ -865,7 +865,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a2b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                      "bytes": "a29c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                     }
                   ]
                 },
@@ -890,7 +890,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c3b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                  "bytes": "c39c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                 }
               ]
             },
@@ -910,7 +910,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c3b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                      "bytes": "c39c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                     }
                   ]
                 },
@@ -935,7 +935,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f3b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                  "bytes": "f39c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                 }
               ]
             },
@@ -955,7 +955,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f3b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                      "bytes": "f39c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                     }
                   ]
                 },
@@ -1928,7 +1928,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "12b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                  "bytes": "129c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                 }
               ]
             },
@@ -1948,7 +1948,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "12b8f1e3ccce22b04a52c498aa9c27da0c7f959c4fe9fea3dc5626da84ff13e8"
+                      "bytes": "129c9b7acc5ba48905bb4abd245767f34f45610d2ea626510eb0269200dbb437"
                     }
                   ]
                 },
@@ -1973,7 +1973,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "352f42f070531b6a7c02f779ac9763d95e473db084a4047c3dad97043621196c"
+                  "bytes": "6a74ea992c2d99109b2922bdeeac5694c3cc1198eeb20b01faf405e86276af34"
                 }
               ]
             },
@@ -1993,7 +1993,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "352f42f070531b6a7c02f779ac9763d95e473db084a4047c3dad97043621196c"
+                      "bytes": "6a74ea992c2d99109b2922bdeeac5694c3cc1198eeb20b01faf405e86276af34"
                     }
                   ]
                 },
@@ -2018,7 +2018,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "92e26bc133340a26f8099ef5b08602bc8224767c515f665b2f1b8b69e8b13ead"
+                  "bytes": "bc54c40bb2aeb5808a0c128a4fa82d968f810874f45a650c62ddbf4c711a983f"
                 }
               ]
             },
@@ -2038,7 +2038,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "92e26bc133340a26f8099ef5b08602bc8224767c515f665b2f1b8b69e8b13ead"
+                      "bytes": "bc54c40bb2aeb5808a0c128a4fa82d968f810874f45a650c62ddbf4c711a983f"
                     }
                   ]
                 },
@@ -2063,7 +2063,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ef4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                  "bytes": "d66f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                 }
               ]
             },
@@ -2083,7 +2083,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ef4f918498f89f04b1aa9a9633cca3cd506316a3da8449223a6b588db23fa51e"
+                      "bytes": "d66f40e9369345254758be394e1220446b5dd5f96eddaa42bf45a1b76542a843"
                     }
                   ]
                 },
@@ -2108,7 +2108,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f93efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                  "bytes": "f1ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                 }
               ]
             },
@@ -2128,7 +2128,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f93efc253f7031925536756eb5b3f2638d8708118e93d606ec69e2500485d1c5"
+                      "bytes": "f1ddf90439800ad3b4761a7440c441fbfe938687b9120585116a52b54330d4a2"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_marks_completed_on_last.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_marks_completed_on_last.1.json
index 2fd40d2..694df0d 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_marks_completed_on_last.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_marks_completed_on_last.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "201fe1e8df6083aa580451e69e07ef882018a4086f9f60988df5b9aeb05ec222"
+                  "bytes": "7a0286948fabadd62e9bd6b827552afb0dad97be1ad5cb12b34ec7f8267859c6"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "f3c13a0009bb5a33994f3b541bb4d9a8422f93d7830e93cdefc40ce19d2f7918"
+                  "bytes": "0e2042b6f664ec3da8768b13aeb26301f987fb77549ce5cba739c0f37da957d5"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "2a699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                  "bytes": "f6284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                 }
               ]
             }
@@ -364,7 +364,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "db9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                  "bytes": "9922cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                 }
               ]
             }
@@ -540,7 +540,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0a9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                  "bytes": "17284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                 }
               ]
             },
@@ -560,7 +560,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0a9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                      "bytes": "17284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                     }
                   ]
                 },
@@ -585,7 +585,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "3a9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                  "bytes": "27284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                 }
               ]
             },
@@ -605,7 +605,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "3a9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                      "bytes": "27284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                     }
                   ]
                 },
@@ -630,7 +630,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6b9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                  "bytes": "2922cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                 }
               ]
             },
@@ -650,7 +650,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6b9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                      "bytes": "2922cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                     }
                   ]
                 },
@@ -675,7 +675,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9a699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                  "bytes": "46284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                 }
               ]
             },
@@ -695,7 +695,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9a699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                      "bytes": "46284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                     }
                   ]
                 },
@@ -720,7 +720,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cb699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                  "bytes": "4822cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                 }
               ]
             },
@@ -740,7 +740,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cb699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                      "bytes": "4822cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                     }
                   ]
                 },
@@ -765,7 +765,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "fb699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                  "bytes": "7822cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                 }
               ]
             },
@@ -785,7 +785,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "fb699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                      "bytes": "7822cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                     }
                   ]
                 },
@@ -1609,7 +1609,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "201fe1e8df6083aa580451e69e07ef882018a4086f9f60988df5b9aeb05ec222"
+                  "bytes": "0e2042b6f664ec3da8768b13aeb26301f987fb77549ce5cba739c0f37da957d5"
                 }
               ]
             },
@@ -1629,7 +1629,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "201fe1e8df6083aa580451e69e07ef882018a4086f9f60988df5b9aeb05ec222"
+                      "bytes": "0e2042b6f664ec3da8768b13aeb26301f987fb77549ce5cba739c0f37da957d5"
                     }
                   ]
                 },
@@ -1654,7 +1654,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2a699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                  "bytes": "7a0286948fabadd62e9bd6b827552afb0dad97be1ad5cb12b34ec7f8267859c6"
                 }
               ]
             },
@@ -1674,7 +1674,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2a699afd76eea7cff72b0e711efd3aaf23c6627c7eb8a1615fff5680c829d7ca"
+                      "bytes": "7a0286948fabadd62e9bd6b827552afb0dad97be1ad5cb12b34ec7f8267859c6"
                     }
                   ]
                 },
@@ -1699,7 +1699,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "db9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                  "bytes": "9922cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                 }
               ]
             },
@@ -1719,7 +1719,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "db9d8e88c64d7561de4388e2a6df09e355ee404981b9bf92d350b141754daf47"
+                      "bytes": "9922cd836444c57c0c2db937962a6d980f8322387ae4e5490339e1ddd079c2eb"
                     }
                   ]
                 },
@@ -1744,7 +1744,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f3c13a0009bb5a33994f3b541bb4d9a8422f93d7830e93cdefc40ce19d2f7918"
+                  "bytes": "f6284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                 }
               ]
             },
@@ -1764,7 +1764,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f3c13a0009bb5a33994f3b541bb4d9a8422f93d7830e93cdefc40ce19d2f7918"
+                      "bytes": "f6284746759695bdfb505660c69fa833825bda744254c1ef9312af80cc204949"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_on_single_release_reverts.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_on_single_release_reverts.1.json
index bbec6e7..bf568a2 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_on_single_release_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_on_single_release_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "a819f11459b5684d40a24ff46bcd164197934682c6c445c79f2b5c331adb9172"
+                  "bytes": "3a32ac4f47b015d8d10274e6a7b0fcaaa46044389f61976fa3a8bc6371b9965d"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a819f11459b5684d40a24ff46bcd164197934682c6c445c79f2b5c331adb9172"
+                  "bytes": "3a32ac4f47b015d8d10274e6a7b0fcaaa46044389f61976fa3a8bc6371b9965d"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a819f11459b5684d40a24ff46bcd164197934682c6c445c79f2b5c331adb9172"
+                      "bytes": "3a32ac4f47b015d8d10274e6a7b0fcaaa46044389f61976fa3a8bc6371b9965d"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_op_replay_reverts.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_op_replay_reverts.1.json
index d04611a..d5551ce 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_op_replay_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_op_replay_reverts.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "e59f5aa843674a13aaf457dc9c1785929c1d827dc9ddcfb741614df03b1a25e4"
+                  "bytes": "7524d1c115bea72c2a5e3dcef1c7fe2f56252e8eee419680917efecfc4f4a797"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "2d78990f8577720f2e7cdbc38646e23a512cbac39f193c90ae5df839659610f8"
+                  "bytes": "ed43900ea2b250e278a4465335845e805eda3fb018aef9542ae80ac26721a231"
                 }
               ]
             }
@@ -332,7 +332,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "5c8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                  "bytes": "c987100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                 }
               ]
             }
@@ -508,7 +508,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8d8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                  "bytes": "1887100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                 }
               ]
             },
@@ -528,7 +528,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8d8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                      "bytes": "1887100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                     }
                   ]
                 },
@@ -553,7 +553,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bd8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                  "bytes": "2887100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                 }
               ]
             },
@@ -573,7 +573,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bd8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                      "bytes": "2887100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                     }
                   ]
                 },
@@ -598,7 +598,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ec8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                  "bytes": "7987100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                 }
               ]
             },
@@ -618,7 +618,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ec8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                      "bytes": "7987100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                     }
                   ]
                 },
@@ -1293,7 +1293,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2d78990f8577720f2e7cdbc38646e23a512cbac39f193c90ae5df839659610f8"
+                  "bytes": "7524d1c115bea72c2a5e3dcef1c7fe2f56252e8eee419680917efecfc4f4a797"
                 }
               ]
             },
@@ -1313,7 +1313,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2d78990f8577720f2e7cdbc38646e23a512cbac39f193c90ae5df839659610f8"
+                      "bytes": "7524d1c115bea72c2a5e3dcef1c7fe2f56252e8eee419680917efecfc4f4a797"
                     }
                   ]
                 },
@@ -1338,7 +1338,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5c8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                  "bytes": "c987100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                 }
               ]
             },
@@ -1358,7 +1358,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5c8b52e0c662d67948b29929bdc2fbd9c74e5ceb25bcc17fe05f6c68d4146add"
+                      "bytes": "c987100b7ed8e24f2169656941e260d6bff0fda64879e2ebcb26c646be755eab"
                     }
                   ]
                 },
@@ -1383,7 +1383,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "e59f5aa843674a13aaf457dc9c1785929c1d827dc9ddcfb741614df03b1a25e4"
+                  "bytes": "ed43900ea2b250e278a4465335845e805eda3fb018aef9542ae80ac26721a231"
                 }
               ]
             },
@@ -1403,7 +1403,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "e59f5aa843674a13aaf457dc9c1785929c1d827dc9ddcfb741614df03b1a25e4"
+                      "bytes": "ed43900ea2b250e278a4465335845e805eda3fb018aef9542ae80ac26721a231"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_out_of_range_reverts.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_out_of_range_reverts.1.json
index 0ec5c7d..305a5d3 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_out_of_range_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_out_of_range_reverts.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "771d8087e3df8b237ce655ecd9058164ee7d4904cb147efd8c1f49c5d819b6c9"
+                  "bytes": "f39e846b406d341cb9ec0456cc3293a696564210d7b90ba94ddf7592fd5dc352"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "bec14ef7eb7342ae11821185a87023d2daa694bf705868b264de3f5f3515e7bf"
+                  "bytes": "41949947e32bb6b90511b3ee2eb10ca9fc403bbf9f3263bacfce79b7e6dfeb99"
                 }
               ]
             }
@@ -865,7 +865,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "771d8087e3df8b237ce655ecd9058164ee7d4904cb147efd8c1f49c5d819b6c9"
+                  "bytes": "41949947e32bb6b90511b3ee2eb10ca9fc403bbf9f3263bacfce79b7e6dfeb99"
                 }
               ]
             },
@@ -885,7 +885,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "771d8087e3df8b237ce655ecd9058164ee7d4904cb147efd8c1f49c5d819b6c9"
+                      "bytes": "41949947e32bb6b90511b3ee2eb10ca9fc403bbf9f3263bacfce79b7e6dfeb99"
                     }
                   ]
                 },
@@ -910,7 +910,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bec14ef7eb7342ae11821185a87023d2daa694bf705868b264de3f5f3515e7bf"
+                  "bytes": "f39e846b406d341cb9ec0456cc3293a696564210d7b90ba94ddf7592fd5dc352"
                 }
               ]
             },
@@ -930,7 +930,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bec14ef7eb7342ae11821185a87023d2daa694bf705868b264de3f5f3515e7bf"
+                      "bytes": "f39e846b406d341cb9ec0456cc3293a696564210d7b90ba94ddf7592fd5dc352"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_pays_fixed_per_milestone_amount.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_pays_fixed_per_milestone_amount.1.json
index 081f5d1..43cefa0 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_pays_fixed_per_milestone_amount.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_pays_fixed_per_milestone_amount.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "53eb1ec426fbbab1fa916c4d39e1df067a4184382c5747ffe59120ae3fe7c91e"
+                  "bytes": "067f94a72c4776c9246c806a76bfc621f84f93941a5fac7107e107d93d630383"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   ]
                 },
                 {
-                  "bytes": "2d8f854252427667d99c19c61655e9885b21262cddc94a2286e4092c8e3ea3b9"
+                  "bytes": "eb57ed874ee3d4ad0618bbe7626640a8bc48cfc6f1138c79e9ea894e12c41655"
                 }
               ]
             }
@@ -334,7 +334,7 @@
                   "u32": 5
                 },
                 {
-                  "bytes": "9509ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                  "bytes": "90b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                 }
               ]
             }
@@ -513,7 +513,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2509ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                  "bytes": "20b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                 }
               ]
             },
@@ -533,7 +533,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2509ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                      "bytes": "20b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                     }
                   ]
                 },
@@ -558,7 +558,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4409ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                  "bytes": "41b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                 }
               ]
             },
@@ -578,7 +578,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4409ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                      "bytes": "41b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                     }
                   ]
                 },
@@ -603,7 +603,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7409ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                  "bytes": "71b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                 }
               ]
             },
@@ -623,7 +623,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7409ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                      "bytes": "71b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                     }
                   ]
                 },
@@ -1298,7 +1298,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2d8f854252427667d99c19c61655e9885b21262cddc94a2286e4092c8e3ea3b9"
+                  "bytes": "067f94a72c4776c9246c806a76bfc621f84f93941a5fac7107e107d93d630383"
                 }
               ]
             },
@@ -1318,7 +1318,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2d8f854252427667d99c19c61655e9885b21262cddc94a2286e4092c8e3ea3b9"
+                      "bytes": "067f94a72c4776c9246c806a76bfc621f84f93941a5fac7107e107d93d630383"
                     }
                   ]
                 },
@@ -1343,7 +1343,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "53eb1ec426fbbab1fa916c4d39e1df067a4184382c5747ffe59120ae3fe7c91e"
+                  "bytes": "90b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                 }
               ]
             },
@@ -1363,7 +1363,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "53eb1ec426fbbab1fa916c4d39e1df067a4184382c5747ffe59120ae3fe7c91e"
+                      "bytes": "90b5945bf1c47207e985469365c91543d90d44b6d756ab3b9d5e2ab3732fdad5"
                     }
                   ]
                 },
@@ -1388,7 +1388,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9509ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                  "bytes": "eb57ed874ee3d4ad0618bbe7626640a8bc48cfc6f1138c79e9ea894e12c41655"
                 }
               ]
             },
@@ -1408,7 +1408,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9509ee721357e3b9ca7319eaaf776bcc8aa27fe0d23eda482fa05e46007a2739"
+                      "bytes": "eb57ed874ee3d4ad0618bbe7626640a8bc48cfc6f1138c79e9ea894e12c41655"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_without_being_winner_reverts.1.json b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_without_being_winner_reverts.1.json
index cc38e49..9c51c3a 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_without_being_winner_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/claim_milestone_without_being_winner_reverts.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "7ff87507ba11e33a1f5b1ee6d099b5bee6edd5dc6cc4eb56ffbc3fe9fe132893"
+                  "bytes": "fb212e5e4b1b1443b701a78128efe41d7ae6f3c8f32407a69738541dc8c148ee"
                 }
               ]
             }
@@ -678,7 +678,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7ff87507ba11e33a1f5b1ee6d099b5bee6edd5dc6cc4eb56ffbc3fe9fe132893"
+                  "bytes": "fb212e5e4b1b1443b701a78128efe41d7ae6f3c8f32407a69738541dc8c148ee"
                 }
               ]
             },
@@ -698,7 +698,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7ff87507ba11e33a1f5b1ee6d099b5bee6edd5dc6cc4eb56ffbc3fe9fe132893"
+                      "bytes": "fb212e5e4b1b1443b701a78128efe41d7ae6f3c8f32407a69738541dc8c148ee"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/grant_create_with_multi_release_succeeds.1.json b/contracts/events/test_snapshots/tests/grant_pillar/grant_create_with_multi_release_succeeds.1.json
index 5f32117..9747ceb 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/grant_create_with_multi_release_succeeds.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/grant_create_with_multi_release_succeeds.1.json
@@ -226,7 +226,7 @@
                   ]
                 },
                 {
-                  "bytes": "75d7351b7ee4783b3fbee2103eb8c1fdacbb4da610c86bc985ccf04d165d6fbf"
+                  "bytes": "3b3386a4155a9c3feb10600690226c9cd6b623e72acd0a9995900eb4de3febaf"
                 }
               ]
             }
@@ -678,7 +678,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "75d7351b7ee4783b3fbee2103eb8c1fdacbb4da610c86bc985ccf04d165d6fbf"
+                  "bytes": "3b3386a4155a9c3feb10600690226c9cd6b623e72acd0a9995900eb4de3febaf"
                 }
               ]
             },
@@ -698,7 +698,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "75d7351b7ee4783b3fbee2103eb8c1fdacbb4da610c86bc985ccf04d165d6fbf"
+                      "bytes": "3b3386a4155a9c3feb10600690226c9cd6b623e72acd0a9995900eb4de3febaf"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/grant_pillar/two_winner_grant_each_claims_their_share.1.json b/contracts/events/test_snapshots/tests/grant_pillar/two_winner_grant_each_claims_their_share.1.json
index 12c3ecd..8306a7e 100644
--- a/contracts/events/test_snapshots/tests/grant_pillar/two_winner_grant_each_claims_their_share.1.json
+++ b/contracts/events/test_snapshots/tests/grant_pillar/two_winner_grant_each_claims_their_share.1.json
@@ -234,7 +234,7 @@
                   ]
                 },
                 {
-                  "bytes": "2cf35adec303da136fdecdaa2e68e400a075c9bb894c4be9abbd1f2f427fea99"
+                  "bytes": "86bab57dbe8dde895cb1306f6a30f2c8f6cd42912d7eb142a6d290816c8f5550"
                 }
               ]
             }
@@ -337,7 +337,7 @@
                   ]
                 },
                 {
-                  "bytes": "2d75bc8e75f2c792250316a1418305d1fd4778558fbefae02ab4b93b876733fe"
+                  "bytes": "6b932ff942d6d54acfac072c3e8416c769e5b7754c1a72dda37cc6a0c94249e0"
                 }
               ]
             }
@@ -371,7 +371,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "6fa27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                  "bytes": "4826a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                 }
               ]
             }
@@ -402,7 +402,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "85b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                  "bytes": "6d853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                 }
               ]
             }
@@ -433,7 +433,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "605737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                  "bytes": "e8de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                 }
               ]
             }
@@ -464,7 +464,7 @@
                   "u32": 0
                 },
                 {
-                  "bytes": "7644cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                  "bytes": "4c40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                 }
               ]
             }
@@ -695,7 +695,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "35b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                  "bytes": "09de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                 }
               ]
             },
@@ -715,7 +715,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "35b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                      "bytes": "09de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                     }
                   ]
                 },
@@ -740,7 +740,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "54b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                  "bytes": "39de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                 }
               ]
             },
@@ -760,7 +760,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "54b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                      "bytes": "39de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                     }
                   ]
                 },
@@ -785,7 +785,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "64b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                  "bytes": "58de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                 }
               ]
             },
@@ -805,7 +805,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "64b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                      "bytes": "58de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                     }
                   ]
                 },
@@ -830,7 +830,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "815737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                  "bytes": "8c853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                 }
               ]
             },
@@ -850,7 +850,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "815737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                      "bytes": "8c853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                     }
                   ]
                 },
@@ -875,7 +875,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8ea27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                  "bytes": "9926a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                 }
               ]
             },
@@ -895,7 +895,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8ea27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                      "bytes": "9926a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                     }
                   ]
                 },
@@ -920,7 +920,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9744cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                  "bytes": "9d40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                 }
               ]
             },
@@ -940,7 +940,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9744cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                      "bytes": "9d40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                     }
                   ]
                 },
@@ -965,7 +965,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a744cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                  "bytes": "a926a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                 }
               ]
             },
@@ -985,7 +985,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a744cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                      "bytes": "a926a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                     }
                   ]
                 },
@@ -1010,7 +1010,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b15737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                  "bytes": "ad40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                 }
               ]
             },
@@ -1030,7 +1030,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b15737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                      "bytes": "ad40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                     }
                   ]
                 },
@@ -1055,7 +1055,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "bea27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                  "bytes": "bc853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                 }
               ]
             },
@@ -1075,7 +1075,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "bea27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                      "bytes": "bc853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                     }
                   ]
                 },
@@ -1100,7 +1100,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c644cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                  "bytes": "dd853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                 }
               ]
             },
@@ -1120,7 +1120,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c644cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                      "bytes": "dd853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                     }
                   ]
                 },
@@ -1145,7 +1145,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d05737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                  "bytes": "f826a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                 }
               ]
             },
@@ -1165,7 +1165,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d05737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                      "bytes": "f826a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                     }
                   ]
                 },
@@ -1190,7 +1190,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "dfa27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                  "bytes": "fc40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                 }
               ]
             },
@@ -1210,7 +1210,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "dfa27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                      "bytes": "fc40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                     }
                   ]
                 },
@@ -2490,7 +2490,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2cf35adec303da136fdecdaa2e68e400a075c9bb894c4be9abbd1f2f427fea99"
+                  "bytes": "4826a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                 }
               ]
             },
@@ -2510,7 +2510,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2cf35adec303da136fdecdaa2e68e400a075c9bb894c4be9abbd1f2f427fea99"
+                      "bytes": "4826a4dd253eaf5b658523eab0139bbeb36b20e38270e257e2cc53ecf43cf6a0"
                     }
                   ]
                 },
@@ -2535,7 +2535,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "2d75bc8e75f2c792250316a1418305d1fd4778558fbefae02ab4b93b876733fe"
+                  "bytes": "4c40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                 }
               ]
             },
@@ -2555,7 +2555,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "2d75bc8e75f2c792250316a1418305d1fd4778558fbefae02ab4b93b876733fe"
+                      "bytes": "4c40883d8ca337eabb857d35178e636ba11ee40ebf73369659e1ab40a256f07c"
                     }
                   ]
                 },
@@ -2580,7 +2580,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "605737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                  "bytes": "6b932ff942d6d54acfac072c3e8416c769e5b7754c1a72dda37cc6a0c94249e0"
                 }
               ]
             },
@@ -2600,7 +2600,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "605737a460c7f27c5223070bf65cc49e223631328ca480d8980fa77d28bf12ff"
+                      "bytes": "6b932ff942d6d54acfac072c3e8416c769e5b7754c1a72dda37cc6a0c94249e0"
                     }
                   ]
                 },
@@ -2625,7 +2625,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "6fa27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                  "bytes": "6d853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                 }
               ]
             },
@@ -2645,7 +2645,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "6fa27239c6d7f424a9d7057accbe3ea009bb81914f77966b95509260e181540e"
+                      "bytes": "6d853f5a4a9a035fb3305c81a60f64f63dc260de5d2f013ce6e6acf78bd37bef"
                     }
                   ]
                 },
@@ -2670,7 +2670,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7644cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                  "bytes": "86bab57dbe8dde895cb1306f6a30f2c8f6cd42912d7eb142a6d290816c8f5550"
                 }
               ]
             },
@@ -2690,7 +2690,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7644cdc9ff283d786cd910c97e99864febb637122b1f2531537efccbc3e6008a"
+                      "bytes": "86bab57dbe8dde895cb1306f6a30f2c8f6cd42912d7eb142a6d290816c8f5550"
                     }
                   ]
                 },
@@ -2715,7 +2715,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "85b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                  "bytes": "e8de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                 }
               ]
             },
@@ -2735,7 +2735,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "85b51570ffaf84256697ebdb066dd67d4aadeee88cac589618d2d5d4adb36937"
+                      "bytes": "e8de2d173cfffeaeca8cdafd2d503b84c01bda28aa12717a69f00d2a94c01281"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/claim_milestone_on_single_release_hackathon_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/claim_milestone_on_single_release_hackathon_reverts.1.json
index 9c1fafd..3b619d9 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/claim_milestone_on_single_release_hackathon_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/claim_milestone_on_single_release_hackathon_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "7fb9c117938a1215a8584bdba3f39f3be77f208d33519d8669be53f4056964bb"
+                  "bytes": "60951a4388482efad86623d0304e462407544ecf127fc404175de2bc690062ec"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "7fb9c117938a1215a8584bdba3f39f3be77f208d33519d8669be53f4056964bb"
+                  "bytes": "60951a4388482efad86623d0304e462407544ecf127fc404175de2bc690062ec"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "7fb9c117938a1215a8584bdba3f39f3be77f208d33519d8669be53f4056964bb"
+                      "bytes": "60951a4388482efad86623d0304e462407544ecf127fc404175de2bc690062ec"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/create_deposits_full_budget_and_takes_fee_at_deposit.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/create_deposits_full_budget_and_takes_fee_at_deposit.1.json
index 56ecf1f..20ff626 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/create_deposits_full_budget_and_takes_fee_at_deposit.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/create_deposits_full_budget_and_takes_fee_at_deposit.1.json
@@ -224,7 +224,7 @@
                   ]
                 },
                 {
-                  "bytes": "00b7f51b8850f639292f0d864bd7a5aa44f27e0e10221b92f261de1d62d60341"
+                  "bytes": "28ddf48f1dee58955c39b69d42efdb51e8d189500c8f0a6061da9ab5f2b5f43d"
                 }
               ]
             }
@@ -675,7 +675,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "00b7f51b8850f639292f0d864bd7a5aa44f27e0e10221b92f261de1d62d60341"
+                  "bytes": "28ddf48f1dee58955c39b69d42efdb51e8d189500c8f0a6061da9ab5f2b5f43d"
                 }
               ]
             },
@@ -695,7 +695,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "00b7f51b8850f639292f0d864bd7a5aa44f27e0e10221b92f261de1d62d60341"
+                      "bytes": "28ddf48f1dee58955c39b69d42efdb51e8d189500c8f0a6061da9ab5f2b5f43d"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/resubmit_keeps_original_timestamp_and_updates_uri.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/resubmit_keeps_original_timestamp_and_updates_uri.1.json
index aad453b..9af6766 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/resubmit_keeps_original_timestamp_and_updates_uri.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/resubmit_keeps_original_timestamp_and_updates_uri.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "ecd5b2d563a31ba4c9ed4fc972717bc42eb4892d612aadb24c6c44c9152a3038"
+                  "bytes": "63cccdb10cb5353f67b4bbc0f0581b7a3c47bf082af36ab59f8703cacc78da80"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../v1.json"
                 },
                 {
-                  "bytes": "8d2e5a07f10749664c81281191c8bdcaa7702f7fcef38bd2c0a7542167564683"
+                  "bytes": "9435b693e4dca42b493542cdb6aa00f4df93a7dd51214f9db4d037cd42e1b5e0"
                 }
               ]
             }
@@ -301,7 +301,7 @@
                   "string": "ipfs://Qm.../v2.json"
                 },
                 {
-                  "bytes": "99a6876276809f331a87ecab6de71a921a685298b4c84730aec3d87b3ff2034f"
+                  "bytes": "a51611148bc8073949cb1378530c199c7df084ed32262e28e310d4d7a9e39266"
                 }
               ]
             }
@@ -805,7 +805,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "8d2e5a07f10749664c81281191c8bdcaa7702f7fcef38bd2c0a7542167564683"
+                  "bytes": "63cccdb10cb5353f67b4bbc0f0581b7a3c47bf082af36ab59f8703cacc78da80"
                 }
               ]
             },
@@ -825,7 +825,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "8d2e5a07f10749664c81281191c8bdcaa7702f7fcef38bd2c0a7542167564683"
+                      "bytes": "63cccdb10cb5353f67b4bbc0f0581b7a3c47bf082af36ab59f8703cacc78da80"
                     }
                   ]
                 },
@@ -850,7 +850,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "99a6876276809f331a87ecab6de71a921a685298b4c84730aec3d87b3ff2034f"
+                  "bytes": "9435b693e4dca42b493542cdb6aa00f4df93a7dd51214f9db4d037cd42e1b5e0"
                 }
               ]
             },
@@ -870,7 +870,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "99a6876276809f331a87ecab6de71a921a685298b4c84730aec3d87b3ff2034f"
+                      "bytes": "9435b693e4dca42b493542cdb6aa00f4df93a7dd51214f9db4d037cd42e1b5e0"
                     }
                   ]
                 },
@@ -895,7 +895,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ecd5b2d563a31ba4c9ed4fc972717bc42eb4892d612aadb24c6c44c9152a3038"
+                  "bytes": "a51611148bc8073949cb1378530c199c7df084ed32262e28e310d4d7a9e39266"
                 }
               ]
             },
@@ -915,7 +915,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ecd5b2d563a31ba4c9ed4fc972717bc42eb4892d612aadb24c6c44c9152a3038"
+                      "bytes": "a51611148bc8073949cb1378530c199c7df084ed32262e28e310d4d7a9e39266"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_demands_owner_auth.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_demands_owner_auth.1.json
index 397b351..ae889f5 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_demands_owner_auth.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_demands_owner_auth.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "5091113712df1428999f4697a7ffcc6e31f3863544309654398f1fe95a394662"
+                  "bytes": "91fee7b39ab212eadaa8be2f72956c33eb12777b766e7b6e5bc483e950859914"
                 }
               ]
             }
@@ -298,7 +298,7 @@
                   ]
                 },
                 {
-                  "bytes": "59cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
+                  "bytes": "f68f1717312eefc8c64db290e53f8d5972378e41a10c2e26e15acf43a3f560fe"
                 }
               ]
             }
@@ -412,254 +412,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "100000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "88cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "88cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "b8cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "b8cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "e9cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "e9cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -898,7 +650,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -908,7 +660,7 @@
                       "val": {
                         "vec": [
                           {
-                            "symbol": "Completed"
+                            "symbol": "Active"
                           }
                         ]
                       }
@@ -1024,9 +776,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1108,7 +858,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "5091113712df1428999f4697a7ffcc6e31f3863544309654398f1fe95a394662"
+                  "bytes": "91fee7b39ab212eadaa8be2f72956c33eb12777b766e7b6e5bc483e950859914"
                 }
               ]
             },
@@ -1128,7 +878,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "5091113712df1428999f4697a7ffcc6e31f3863544309654398f1fe95a394662"
+                      "bytes": "91fee7b39ab212eadaa8be2f72956c33eb12777b766e7b6e5bc483e950859914"
                     }
                   ]
                 },
@@ -1153,7 +903,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "59cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
+                  "bytes": "f68f1717312eefc8c64db290e53f8d5972378e41a10c2e26e15acf43a3f560fe"
                 }
               ]
             },
@@ -1173,7 +923,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "59cc403a37d9cf22ed7791fc01a6f405dc7fa2ca31e61a19ff167bbe62beea13"
+                      "bytes": "f68f1717312eefc8c64db290e53f8d5972378e41a10c2e26e15acf43a3f560fe"
                     }
                   ]
                 },
@@ -1618,7 +1368,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -1716,76 +1466,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "100000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -1922,213 +1602,6 @@
     ]
   },
   "events": [
-    {
-      "event": {
-        "ext": "v0",
-        "contract_id": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-        "type_": "contract",
-        "body": {
-          "v0": {
-            "topics": [
-              {
-                "symbol": "transfer"
-              },
-              {
-                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
-              },
-              {
-                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-              },
-              {
-                "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPP4V"
-              }
-            ],
-            "data": {
-              "i128": "100000000000"
-            }
-          }
-        }
-      },
-      "failed_call": false
-    },
-    {
-      "event": {
-        "ext": "v0",
-        "contract_id": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-        "type_": "contract",
-        "body": {
-          "v0": {
-            "topics": [
-              {
-                "symbol": "profile_bootstrapped"
-              }
-            ],
-            "data": {
-              "map": [
-                {
-                  "key": {
-                    "symbol": "user"
-                  },
-                  "val": {
-                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                  }
-                }
-              ]
-            }
-          }
-        }
-      },
-      "failed_call": false
-    },
-    {
-      "event": {
-        "ext": "v0",
-        "contract_id": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-        "type_": "contract",
-        "body": {
-          "v0": {
-            "topics": [
-              {
-                "symbol": "reputation_bumped"
-              }
-            ],
-            "data": {
-              "map": [
-                {
-                  "key": {
-                    "symbol": "delta"
-                  },
-                  "val": {
-                    "u32": 0
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "reason"
-                  },
-                  "val": {
-                    "symbol": "win"
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "user"
-                  },
-                  "val": {
-                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                  }
-                }
-              ]
-            }
-          }
-        }
-      },
-      "failed_call": false
-    },
-    {
-      "event": {
-        "ext": "v0",
-        "contract_id": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-        "type_": "contract",
-        "body": {
-          "v0": {
-            "topics": [
-              {
-                "symbol": "earnings_registered"
-              }
-            ],
-            "data": {
-              "map": [
-                {
-                  "key": {
-                    "symbol": "amount"
-                  },
-                  "val": {
-                    "i128": "100000000000"
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "token"
-                  },
-                  "val": {
-                    "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "user"
-                  },
-                  "val": {
-                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                  }
-                }
-              ]
-            }
-          }
-        }
-      },
-      "failed_call": false
-    },
-    {
-      "event": {
-        "ext": "v0",
-        "contract_id": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
-        "type_": "contract",
-        "body": {
-          "v0": {
-            "topics": [
-              {
-                "symbol": "winner_paid"
-              }
-            ],
-            "data": {
-              "map": [
-                {
-                  "key": {
-                    "symbol": "amount"
-                  },
-                  "val": {
-                    "i128": "100000000000"
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "event_id"
-                  },
-                  "val": {
-                    "u64": "1"
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "milestone"
-                  },
-                  "val": "void"
-                },
-                {
-                  "key": {
-                    "symbol": "position"
-                  },
-                  "val": {
-                    "u32": 1
-                  }
-                },
-                {
-                  "key": {
-                    "symbol": "recipient"
-                  },
-                  "val": {
-                    "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                  }
-                }
-              ]
-            }
-          }
-        }
-      },
-      "failed_call": false
-    },
     {
       "event": {
         "ext": "v0",
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_duplicate_position_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_duplicate_position_reverts.1.json
index b203189..9a3c0a8 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_duplicate_position_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_duplicate_position_reverts.1.json
@@ -239,7 +239,7 @@
                   ]
                 },
                 {
-                  "bytes": "0e661d6d3f6c5659721d9c23fb50901a05ea334f8fbc48ba3c638fdc9cebe5bd"
+                  "bytes": "fce20c2995ffcd03891c022b8bb3a749c632cf9e50c242839c07ecdff8d56ee3"
                 }
               ]
             }
@@ -704,7 +704,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "0e661d6d3f6c5659721d9c23fb50901a05ea334f8fbc48ba3c638fdc9cebe5bd"
+                  "bytes": "fce20c2995ffcd03891c022b8bb3a749c632cf9e50c242839c07ecdff8d56ee3"
                 }
               ]
             },
@@ -724,7 +724,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "0e661d6d3f6c5659721d9c23fb50901a05ea334f8fbc48ba3c638fdc9cebe5bd"
+                      "bytes": "fce20c2995ffcd03891c022b8bb3a749c632cf9e50c242839c07ecdff8d56ee3"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_empty_set_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_empty_set_reverts.1.json
index 250050b..4928317 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_empty_set_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_empty_set_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "43bb0389e6719ceddf2030d5d2ba82b3dd59937f3a8b32c67ff56d7671a4b7eb"
+                  "bytes": "26f1f4d8e07f56de6e6093963589f672b5b6f92d64920b60a453faabfc5ff46b"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "43bb0389e6719ceddf2030d5d2ba82b3dd59937f3a8b32c67ff56d7671a4b7eb"
+                  "bytes": "26f1f4d8e07f56de6e6093963589f672b5b6f92d64920b60a453faabfc5ff46b"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "43bb0389e6719ceddf2030d5d2ba82b3dd59937f3a8b32c67ff56d7671a4b7eb"
+                      "bytes": "26f1f4d8e07f56de6e6093963589f672b5b6f92d64920b60a453faabfc5ff46b"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_multi_position_splits_by_distribution.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_multi_position_splits_by_distribution.1.json
index 90523a5..bc41b83 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_multi_position_splits_by_distribution.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_multi_position_splits_by_distribution.1.json
@@ -239,7 +239,7 @@
                   ]
                 },
                 {
-                  "bytes": "470ca1e09f96db9c2e138c68a4677ae37810b9844e8971d88a9cd6c9559feb56"
+                  "bytes": "f24214486fa6a39ac4c2ed6f956f53550b6b416292f221deb28a5327aa967c5b"
                 }
               ]
             }
@@ -371,7 +371,100 @@
                   ]
                 },
                 {
-                  "bytes": "d3c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "14aa0e0bc45fc2059ff449271b18ab9b22833f4eddf7ed34b8678ea2926e1546"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 60
+                },
+                {
+                  "bytes": "e3b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 2
+                },
+                {
+                  "u32": 40
+                },
+                {
+                  "bytes": "cc1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5"
+                },
+                {
+                  "u32": 3
+                },
+                {
+                  "u32": 20
+                },
+                {
+                  "bytes": "a3ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                 }
               ]
             }
@@ -657,7 +750,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "02c0a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "02b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
                 }
               ]
             },
@@ -677,7 +770,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "02c0a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "02b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
                     }
                   ]
                 },
@@ -702,7 +795,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "02c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "13ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                 }
               ]
             },
@@ -722,7 +815,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "02c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "13ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                     }
                   ]
                 },
@@ -747,7 +840,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "02c3a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "1d1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
                 }
               ]
             },
@@ -767,7 +860,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "02c3a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "1d1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
                     }
                   ]
                 },
@@ -792,7 +885,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "32c0a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "2d1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
                 }
               ]
             },
@@ -812,7 +905,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "32c0a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "2d1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
                     }
                   ]
                 },
@@ -837,7 +930,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "32c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "32b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
                 }
               ]
             },
@@ -857,7 +950,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "32c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "32b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
                     }
                   ]
                 },
@@ -882,7 +975,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "32c3a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "42ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                 }
               ]
             },
@@ -902,7 +995,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "32c3a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "42ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                     }
                   ]
                 },
@@ -927,7 +1020,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "63c0a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "53b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
                 }
               ]
             },
@@ -947,7 +1040,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "63c0a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "53b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
                     }
                   ]
                 },
@@ -972,7 +1065,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "63c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "72ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                 }
               ]
             },
@@ -992,7 +1085,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "63c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "72ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
                     }
                   ]
                 },
@@ -1017,7 +1110,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "63c3a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "bytes": "7c1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
                 }
               ]
             },
@@ -1037,7 +1130,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "63c3a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "bytes": "7c1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
                     }
                   ]
                 },
@@ -1618,9 +1711,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1708,9 +1799,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1798,9 +1887,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1834,10 +1921,13 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "EventWinnerCount"
+                  "symbol": "EventWinnerAt"
                 },
                 {
                   "u64": "1"
+                },
+                {
+                  "u32": 3
                 }
               ]
             },
@@ -1854,16 +1944,58 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "EventWinnerCount"
+                      "symbol": "EventWinnerAt"
                     },
                     {
                       "u64": "1"
+                    },
+                    {
+                      "u32": 3
                     }
                   ]
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 3
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "50000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                      }
+                    }
+                  ]
                 }
               }
             },
@@ -1879,14 +2011,17 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "OpSeen"
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
                 },
                 {
-                  "bytes": "470ca1e09f96db9c2e138c68a4677ae37810b9844e8971d88a9cd6c9559feb56"
+                  "u32": 4
                 }
               ]
             },
-            "durability": "temporary"
+            "durability": "persistent"
           }
         },
         [
@@ -1899,22 +2034,64 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "OpSeen"
+                      "symbol": "EventWinnerAt"
                     },
                     {
-                      "bytes": "470ca1e09f96db9c2e138c68a4677ae37810b9844e8971d88a9cd6c9559feb56"
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 4
                     }
                   ]
                 },
-                "durability": "temporary",
+                "durability": "persistent",
                 "val": {
-                  "bool": true
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "30000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 2
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                      }
+                    }
+                  ]
                 }
               }
             },
             "ext": "v0"
           },
-          15
+          1555200
         ]
       ],
       [
@@ -1924,14 +2101,17 @@
             "key": {
               "vec": [
                 {
-                  "symbol": "OpSeen"
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
                 },
                 {
-                  "bytes": "d3c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                  "u32": 5
                 }
               ]
             },
-            "durability": "temporary"
+            "durability": "persistent"
           }
         },
         [
@@ -1944,22 +2124,505 @@
                 "key": {
                   "vec": [
                     {
-                      "symbol": "OpSeen"
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
                     },
                     {
-                      "bytes": "d3c2a084dec418cca77cf4e658f8bd720cb6986a01457fd52bb2b3b5c91bcb23"
+                      "u32": 5
                     }
                   ]
                 },
-                "durability": "temporary",
+                "durability": "persistent",
                 "val": {
-                  "bool": true
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "20000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": {
+                        "u64": "0"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 3
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5"
+                      }
+                    }
+                  ]
                 }
               }
             },
             "ext": "v0"
           },
-          15
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerCount"
+                },
+                {
+                  "u64": "1"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerCount"
+                    },
+                    {
+                      "u64": "1"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "u32": 6
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "14aa0e0bc45fc2059ff449271b18ab9b22833f4eddf7ed34b8678ea2926e1546"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "14aa0e0bc45fc2059ff449271b18ab9b22833f4eddf7ed34b8678ea2926e1546"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "a3ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "a3ba857cdf548346eabf25fd5fbdcdb1e93b01c7561443e53af4328dc7d7c133"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "cc1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "cc1cc174f6ae775f6115df5a68021673ba76790bc1d7364b4f7e7bea983e1701"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "e3b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "e3b58ded34fd6f52edb5e33c7b191cc20efa8f0dee6f8ffa38edcbad55f94f3a"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "f24214486fa6a39ac4c2ed6f956f53550b6b416292f221deb28a5327aa967c5b"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "f24214486fa6a39ac4c2ed6f956f53550b6b416292f221deb28a5327aa967c5b"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                },
+                {
+                  "u32": 2
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N"
+                    },
+                    {
+                      "u32": 2
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5"
+                },
+                {
+                  "u32": 3
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5"
+                    },
+                    {
+                      "u32": 3
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
         ]
       ],
       [
@@ -2280,6 +2943,105 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "5806905060045992000"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "5806905060045992000"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "1194852393571756375"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "1194852393571756375"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_on_completed_event_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_on_completed_event_reverts.1.json
index 36b10a8..f9bb76f 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_on_completed_event_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_on_completed_event_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "cdadc437e431e23d7350881318e5f5fc0355835dd09aaeff682ba0d33b731654"
+                  "bytes": "7c3b944c2c6536b8bedf84a5aecff9baf4b12e9e47855ecd96119711af7229f7"
                 }
               ]
             }
@@ -298,7 +298,39 @@
                   ]
                 },
                 {
-                  "bytes": "4649acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                  "bytes": "be1c1c288b96c27b936aa3d18181c08c8fd41c17ff004026b7b791cb79288c15"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 0
+                },
+                {
+                  "bytes": "bc05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                 }
               ]
             }
@@ -475,7 +507,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9749acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                  "bytes": "0c05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                 }
               ]
             },
@@ -495,7 +527,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9749acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                      "bytes": "0c05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                     }
                   ]
                 },
@@ -520,7 +552,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "a749acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                  "bytes": "5d05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                 }
               ]
             },
@@ -540,7 +572,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "a749acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                      "bytes": "5d05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                     }
                   ]
                 },
@@ -565,7 +597,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "f649acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                  "bytes": "6d05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                 }
               ]
             },
@@ -585,7 +617,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "f649acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                      "bytes": "6d05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                     }
                   ]
                 },
@@ -1006,6 +1038,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "100000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1091,7 +1211,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1110,7 +1230,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "4649acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                  "bytes": "7c3b944c2c6536b8bedf84a5aecff9baf4b12e9e47855ecd96119711af7229f7"
                 }
               ]
             },
@@ -1130,7 +1250,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "4649acde1269564bc76d26a07080924eff8cc7a86a5b69c305da8657c92212c5"
+                      "bytes": "7c3b944c2c6536b8bedf84a5aecff9baf4b12e9e47855ecd96119711af7229f7"
                     }
                   ]
                 },
@@ -1155,7 +1275,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cdadc437e431e23d7350881318e5f5fc0355835dd09aaeff682ba0d33b731654"
+                  "bytes": "bc05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                 }
               ]
             },
@@ -1175,7 +1295,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cdadc437e431e23d7350881318e5f5fc0355835dd09aaeff682ba0d33b731654"
+                      "bytes": "bc05dfebf04c01a1b50fbcbaa0e74370e642be79eda103aab39a07e43fc7e060"
                     }
                   ]
                 },
@@ -1190,6 +1310,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "be1c1c288b96c27b936aa3d18181c08c8fd41c17ff004026b7b791cb79288c15"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "be1c1c288b96c27b936aa3d18181c08c8fd41c17ff004026b7b791cb79288c15"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1508,6 +1730,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_position_not_in_distribution_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_position_not_in_distribution_reverts.1.json
index b98db55..9a4f5b2 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_position_not_in_distribution_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_position_not_in_distribution_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "1c38b54276d093b051180a67e486fcd8f5b8c5da1afbaeac949e76f92f8f6084"
+                  "bytes": "181019c4b664e355e8a6a99de38eef6d7e9b00b409bc85df11be1c9facc5956f"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "1c38b54276d093b051180a67e486fcd8f5b8c5da1afbaeac949e76f92f8f6084"
+                  "bytes": "181019c4b664e355e8a6a99de38eef6d7e9b00b409bc85df11be1c9facc5956f"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "1c38b54276d093b051180a67e486fcd8f5b8c5da1afbaeac949e76f92f8f6084"
+                      "bytes": "181019c4b664e355e8a6a99de38eef6d7e9b00b409bc85df11be1c9facc5956f"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_replayed_op_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_replayed_op_reverts.1.json
index e24674c..e38572b 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_replayed_op_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_replayed_op_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "cc203eb52aedca0ce5ee4870e4c06bc7743d75aa065b7504e515db433e9dd1bc"
+                  "bytes": "32296f009b868ee3c0706e6eccd87748a9838672a0329dfed6fb4f31b61a5388"
                 }
               ]
             }
@@ -298,7 +298,7 @@
                   ]
                 },
                 {
-                  "bytes": "d83ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
+                  "bytes": "ba9853e0d3b74806b3a42132129c6437c4b390c548538e7f0cddae4b1f7a31af"
                 }
               ]
             }
@@ -413,254 +413,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "100000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "093ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "093ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "393ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "393ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "683ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "683ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -899,7 +651,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -909,7 +661,7 @@
                       "val": {
                         "vec": [
                           {
-                            "symbol": "Completed"
+                            "symbol": "Active"
                           }
                         ]
                       }
@@ -1025,9 +777,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1109,7 +859,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "cc203eb52aedca0ce5ee4870e4c06bc7743d75aa065b7504e515db433e9dd1bc"
+                  "bytes": "32296f009b868ee3c0706e6eccd87748a9838672a0329dfed6fb4f31b61a5388"
                 }
               ]
             },
@@ -1129,7 +879,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "cc203eb52aedca0ce5ee4870e4c06bc7743d75aa065b7504e515db433e9dd1bc"
+                      "bytes": "32296f009b868ee3c0706e6eccd87748a9838672a0329dfed6fb4f31b61a5388"
                     }
                   ]
                 },
@@ -1154,7 +904,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "d83ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
+                  "bytes": "ba9853e0d3b74806b3a42132129c6437c4b390c548538e7f0cddae4b1f7a31af"
                 }
               ]
             },
@@ -1174,7 +924,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "d83ab2485d01ca937a9f26927fab09f414f51162b1aae042c0acbeea7dc6160b"
+                      "bytes": "ba9853e0d3b74806b3a42132129c6437c4b390c548538e7f0cddae4b1f7a31af"
                     }
                   ]
                 },
@@ -1619,7 +1369,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "0"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -1717,76 +1467,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "100000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_second_call_reverts_winners_already_selected.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_second_call_reverts_winners_already_selected.1.json
index 321c839..2b79c8c 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_second_call_reverts_winners_already_selected.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_second_call_reverts_winners_already_selected.1.json
@@ -239,7 +239,7 @@
                   ]
                 },
                 {
-                  "bytes": "b4fea59180af646f939b2da6b544e12b5aaca7213251736dc4c6ab280069d798"
+                  "bytes": "56549a54f30554ed29f069186adb01769649a2d77c98ff94ee21803f3473575b"
                 }
               ]
             }
@@ -314,7 +314,7 @@
                   ]
                 },
                 {
-                  "bytes": "fd73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
+                  "bytes": "246bb307e16512b92867302c42da53ee4d2e14d687db952b224f1ffa9b4953bb"
                 }
               ]
             }
@@ -430,254 +430,6 @@
           6311999
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "EarningsByToken"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                },
-                {
-                  "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "EarningsByToken"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    },
-                    {
-                      "address": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "i128": "50000000000"
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "1c73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "1c73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "2c73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "2c73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "OpSeen"
-                },
-                {
-                  "bytes": "4d73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
-                }
-              ]
-            },
-            "durability": "temporary"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "OpSeen"
-                    },
-                    {
-                      "bytes": "4d73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
-                    }
-                  ]
-                },
-                "durability": "temporary",
-                "val": {
-                  "bool": true
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          15
-        ]
-      ],
-      [
-        {
-          "contract_data": {
-            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Profile"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Profile"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "bootstrapped_at"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "reputation"
-                      },
-                      "val": {
-                        "u64": "0"
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          1555200
-        ]
-      ],
       [
         {
           "contract_data": {
@@ -916,7 +668,7 @@
                         "symbol": "remaining_escrow"
                       },
                       "val": {
-                        "i128": "50000000000"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -1058,9 +810,7 @@
                       "key": {
                         "symbol": "paid_at"
                       },
-                      "val": {
-                        "u64": "0"
-                      }
+                      "val": "void"
                     },
                     {
                       "key": {
@@ -1142,7 +892,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "b4fea59180af646f939b2da6b544e12b5aaca7213251736dc4c6ab280069d798"
+                  "bytes": "246bb307e16512b92867302c42da53ee4d2e14d687db952b224f1ffa9b4953bb"
                 }
               ]
             },
@@ -1162,7 +912,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "b4fea59180af646f939b2da6b544e12b5aaca7213251736dc4c6ab280069d798"
+                      "bytes": "246bb307e16512b92867302c42da53ee4d2e14d687db952b224f1ffa9b4953bb"
                     }
                   ]
                 },
@@ -1187,7 +937,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "fd73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
+                  "bytes": "56549a54f30554ed29f069186adb01769649a2d77c98ff94ee21803f3473575b"
                 }
               ]
             },
@@ -1207,7 +957,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "fd73f1e7aa10767ce5be8c9362736636e9c7ded37e90f1696c7de06b45cc1884"
+                      "bytes": "56549a54f30554ed29f069186adb01769649a2d77c98ff94ee21803f3473575b"
                     }
                   ]
                 },
@@ -1652,7 +1402,7 @@
                         "symbol": "amount"
                       },
                       "val": {
-                        "i128": "50000000000"
+                        "i128": "100000000000"
                       }
                     },
                     {
@@ -1750,76 +1500,6 @@
           518400
         ]
       ],
-      [
-        {
-          "contract_data": {
-            "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-            "key": {
-              "vec": [
-                {
-                  "symbol": "Balance"
-                },
-                {
-                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                }
-              ]
-            },
-            "durability": "persistent"
-          }
-        },
-        [
-          {
-            "last_modified_ledger_seq": 0,
-            "data": {
-              "contract_data": {
-                "ext": "v0",
-                "contract": "CDS3FDGQ4JA2V3F26Y4BMWWJEC5TT26RJBN7KIQKUMVO2MAOCMDTSZ7A",
-                "key": {
-                  "vec": [
-                    {
-                      "symbol": "Balance"
-                    },
-                    {
-                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
-                    }
-                  ]
-                },
-                "durability": "persistent",
-                "val": {
-                  "map": [
-                    {
-                      "key": {
-                        "symbol": "amount"
-                      },
-                      "val": {
-                        "i128": "50000000000"
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "authorized"
-                      },
-                      "val": {
-                        "bool": true
-                      }
-                    },
-                    {
-                      "key": {
-                        "symbol": "clawback"
-                      },
-                      "val": {
-                        "bool": false
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "ext": "v0"
-          },
-          518400
-        ]
-      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_single_recipient_sweeps_escrow.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_single_recipient_sweeps_escrow.1.json
index 8496df3..e9745d4 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_single_recipient_sweeps_escrow.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/select_winners_single_recipient_sweeps_escrow.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "c13d6a96956c27baf260616cc66d9d9b451c42230530ecc6b5da5e3401a14820"
+                  "bytes": "cdb002631d1f20420a00df6a2b92152df8ce3ecbbd25c14263c84cb086c81416"
                 }
               ]
             }
@@ -300,7 +300,38 @@
                   ]
                 },
                 {
-                  "bytes": "c1a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                  "bytes": "67c9e397d54cb72f3e859f6d5ccb8c450ee7bb9ad337a3d447788f98d57006dd"
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+              "function_name": "claim_prize",
+              "args": [
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                },
+                {
+                  "u32": 50
+                },
+                {
+                  "bytes": "68135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                 }
               ]
             }
@@ -481,7 +512,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "10a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                  "bytes": "89135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                 }
               ]
             },
@@ -501,7 +532,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "10a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                      "bytes": "89135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                     }
                   ]
                 },
@@ -526,7 +557,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "20a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                  "bytes": "b9135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                 }
               ]
             },
@@ -546,7 +577,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "20a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                      "bytes": "b9135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                     }
                   ]
                 },
@@ -571,7 +602,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "71a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                  "bytes": "d8135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                 }
               ]
             },
@@ -591,7 +622,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "71a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                      "bytes": "d8135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                     }
                   ]
                 },
@@ -1012,6 +1043,94 @@
                   ]
                 },
                 "durability": "persistent",
+                "val": {
+                  "map": [
+                    {
+                      "key": {
+                        "symbol": "amount"
+                      },
+                      "val": {
+                        "i128": "100000000000"
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "milestone"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "paid_at"
+                      },
+                      "val": "void"
+                    },
+                    {
+                      "key": {
+                        "symbol": "position"
+                      },
+                      "val": {
+                        "u32": 1
+                      }
+                    },
+                    {
+                      "key": {
+                        "symbol": "recipient"
+                      },
+                      "val": {
+                        "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "EventWinnerAt"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "EventWinnerAt"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
                 "val": {
                   "map": [
                     {
@@ -1097,7 +1216,7 @@
                 },
                 "durability": "persistent",
                 "val": {
-                  "u32": 1
+                  "u32": 2
                 }
               }
             },
@@ -1116,7 +1235,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c13d6a96956c27baf260616cc66d9d9b451c42230530ecc6b5da5e3401a14820"
+                  "bytes": "67c9e397d54cb72f3e859f6d5ccb8c450ee7bb9ad337a3d447788f98d57006dd"
                 }
               ]
             },
@@ -1136,7 +1255,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c13d6a96956c27baf260616cc66d9d9b451c42230530ecc6b5da5e3401a14820"
+                      "bytes": "67c9e397d54cb72f3e859f6d5ccb8c450ee7bb9ad337a3d447788f98d57006dd"
                     }
                   ]
                 },
@@ -1161,7 +1280,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c1a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                  "bytes": "68135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                 }
               ]
             },
@@ -1181,7 +1300,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c1a32139350b0e6da0ccde13842f111e34cdb4e2efed90c0ac3525710b53cd0d"
+                      "bytes": "68135287e88ecab103e2bb6f29575bd919d0543bddfc80b235f61be11417a5f4"
                     }
                   ]
                 },
@@ -1196,6 +1315,108 @@
           15
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "OpSeen"
+                },
+                {
+                  "bytes": "cdb002631d1f20420a00df6a2b92152df8ce3ecbbd25c14263c84cb086c81416"
+                }
+              ]
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "OpSeen"
+                    },
+                    {
+                      "bytes": "cdb002631d1f20420a00df6a2b92152df8ce3ecbbd25c14263c84cb086c81416"
+                    }
+                  ]
+                },
+                "durability": "temporary",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          15
+        ]
+      ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "PrizeClaimed"
+                },
+                {
+                  "u64": "1"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                },
+                {
+                  "u32": 1
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "PrizeClaimed"
+                    },
+                    {
+                      "u64": "1"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
+                    },
+                    {
+                      "u32": 1
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "bool": true
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          1555200
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -1514,6 +1735,39 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": "6277191135259896685"
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": "6277191135259896685"
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/submit_after_deadline_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/submit_after_deadline_reverts.1.json
index f7881c3..bfbe2b1 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/submit_after_deadline_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/submit_after_deadline_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "9a761996eb98c22490f1b4e447f419083c0ed2c995876c622c5aa9f863a0d06c"
+                  "bytes": "ae98938aceb5b7448ea813f3d7cb3f911696a9d1c35d1d6d5f2366bd8deb2688"
                 }
               ]
             }
@@ -672,7 +672,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "9a761996eb98c22490f1b4e447f419083c0ed2c995876c622c5aa9f863a0d06c"
+                  "bytes": "ae98938aceb5b7448ea813f3d7cb3f911696a9d1c35d1d6d5f2366bd8deb2688"
                 }
               ]
             },
@@ -692,7 +692,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "9a761996eb98c22490f1b4e447f419083c0ed2c995876c622c5aa9f863a0d06c"
+                      "bytes": "ae98938aceb5b7448ea813f3d7cb3f911696a9d1c35d1d6d5f2366bd8deb2688"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/submit_open_without_prior_apply_creates_anchor.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/submit_open_without_prior_apply_creates_anchor.1.json
index 5bcfb48..b071052 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/submit_open_without_prior_apply_creates_anchor.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/submit_open_without_prior_apply_creates_anchor.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "79e74b523e48fa8424309c39814afbfda765c79958a1d390c3fef4b8c541395a"
+                  "bytes": "84cce9c801cd0a1a01f46190aceaf0bccb7427c97122845a36cbdabcfa886400"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../project.json"
                 },
                 {
-                  "bytes": "70d08f1496d74c7ee8d41d9c0f53592bf055f71d4070011f5e1adebf528af08b"
+                  "bytes": "1432402e2bdc815dfbe543265cf9481e9ede5177fbd9b15677d097e5b1456e9f"
                 }
               ]
             }
@@ -776,7 +776,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "70d08f1496d74c7ee8d41d9c0f53592bf055f71d4070011f5e1adebf528af08b"
+                  "bytes": "1432402e2bdc815dfbe543265cf9481e9ede5177fbd9b15677d097e5b1456e9f"
                 }
               ]
             },
@@ -796,7 +796,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "70d08f1496d74c7ee8d41d9c0f53592bf055f71d4070011f5e1adebf528af08b"
+                      "bytes": "1432402e2bdc815dfbe543265cf9481e9ede5177fbd9b15677d097e5b1456e9f"
                     }
                   ]
                 },
@@ -821,7 +821,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "79e74b523e48fa8424309c39814afbfda765c79958a1d390c3fef4b8c541395a"
+                  "bytes": "84cce9c801cd0a1a01f46190aceaf0bccb7427c97122845a36cbdabcfa886400"
                 }
               ]
             },
@@ -841,7 +841,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "79e74b523e48fa8424309c39814afbfda765c79958a1d390c3fef4b8c541395a"
+                      "bytes": "84cce9c801cd0a1a01f46190aceaf0bccb7427c97122845a36cbdabcfa886400"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/submit_replayed_op_reverts.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/submit_replayed_op_reverts.1.json
index 71388c6..afe208a 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/submit_replayed_op_reverts.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/submit_replayed_op_reverts.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "ec18a710214be083185a5f8f25f8158ad933478f721b423ca2b028b71d0de9b2"
+                  "bytes": "0dc28bb844107dc36e28b1754b50a4142a4025d955af0ef9722c9dac1ef41a49"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../v1.json"
                 },
                 {
-                  "bytes": "60a8d10c0ac6da80cbabe1c132f0819b2ed4f7f53eeeac0f5bf6d459769229cc"
+                  "bytes": "227ed6387069f39d3022846e733f387ccf5753939859a0617a98863cd5ff3611"
                 }
               ]
             }
@@ -776,7 +776,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "60a8d10c0ac6da80cbabe1c132f0819b2ed4f7f53eeeac0f5bf6d459769229cc"
+                  "bytes": "0dc28bb844107dc36e28b1754b50a4142a4025d955af0ef9722c9dac1ef41a49"
                 }
               ]
             },
@@ -796,7 +796,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "60a8d10c0ac6da80cbabe1c132f0819b2ed4f7f53eeeac0f5bf6d459769229cc"
+                      "bytes": "0dc28bb844107dc36e28b1754b50a4142a4025d955af0ef9722c9dac1ef41a49"
                     }
                   ]
                 },
@@ -821,7 +821,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "ec18a710214be083185a5f8f25f8158ad933478f721b423ca2b028b71d0de9b2"
+                  "bytes": "227ed6387069f39d3022846e733f387ccf5753939859a0617a98863cd5ff3611"
                 }
               ]
             },
@@ -841,7 +841,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "ec18a710214be083185a5f8f25f8158ad933478f721b423ca2b028b71d0de9b2"
+                      "bytes": "227ed6387069f39d3022846e733f387ccf5753939859a0617a98863cd5ff3611"
                     }
                   ]
                 },
diff --git a/contracts/events/test_snapshots/tests/hackathon_pillar/withdraw_submission_removes_anchor.1.json b/contracts/events/test_snapshots/tests/hackathon_pillar/withdraw_submission_removes_anchor.1.json
index f237f17..82dc231 100644
--- a/contracts/events/test_snapshots/tests/hackathon_pillar/withdraw_submission_removes_anchor.1.json
+++ b/contracts/events/test_snapshots/tests/hackathon_pillar/withdraw_submission_removes_anchor.1.json
@@ -223,7 +223,7 @@
                   ]
                 },
                 {
-                  "bytes": "c382de3fe046dfa52d505aaff7edb01fbd0c9334f6769260d7c2c18ea6795a51"
+                  "bytes": "c640aa4f966a9c83a999181c3769a040c728917cdbfd54dc6f914b5b15693df8"
                 }
               ]
             }
@@ -272,7 +272,7 @@
                   "string": "ipfs://Qm.../v1.json"
                 },
                 {
-                  "bytes": "81acf2460c2dc10d464c4f288e7bb4257e976a23e757d542348163dc3452ad64"
+                  "bytes": "1c2ee231beb1f6579ec9d3272c36b5f7549bc2f15a890cb5d9c6582285be7fde"
                 }
               ]
             }
@@ -297,7 +297,7 @@
                   "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON"
                 },
                 {
-                  "bytes": "61961cf08e34541f5ad166036ae82553d7990692beb5f11ce3e92fb92477abd7"
+                  "bytes": "9940964ea1ea8684f7e4a7fd67968c8e7586674d0ae6f6a691f022cda7e90557"
                 }
               ]
             }
@@ -725,7 +725,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "61961cf08e34541f5ad166036ae82553d7990692beb5f11ce3e92fb92477abd7"
+                  "bytes": "1c2ee231beb1f6579ec9d3272c36b5f7549bc2f15a890cb5d9c6582285be7fde"
                 }
               ]
             },
@@ -745,7 +745,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "61961cf08e34541f5ad166036ae82553d7990692beb5f11ce3e92fb92477abd7"
+                      "bytes": "1c2ee231beb1f6579ec9d3272c36b5f7549bc2f15a890cb5d9c6582285be7fde"
                     }
                   ]
                 },
@@ -770,7 +770,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "81acf2460c2dc10d464c4f288e7bb4257e976a23e757d542348163dc3452ad64"
+                  "bytes": "9940964ea1ea8684f7e4a7fd67968c8e7586674d0ae6f6a691f022cda7e90557"
                 }
               ]
             },
@@ -790,7 +790,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "81acf2460c2dc10d464c4f288e7bb4257e976a23e757d542348163dc3452ad64"
+                      "bytes": "9940964ea1ea8684f7e4a7fd67968c8e7586674d0ae6f6a691f022cda7e90557"
                     }
                   ]
                 },
@@ -815,7 +815,7 @@
                   "symbol": "OpSeen"
                 },
                 {
-                  "bytes": "c382de3fe046dfa52d505aaff7edb01fbd0c9334f6769260d7c2c18ea6795a51"
+                  "bytes": "c640aa4f966a9c83a999181c3769a040c728917cdbfd54dc6f914b5b15693df8"
                 }
               ]
             },
@@ -835,7 +835,7 @@
                       "symbol": "OpSeen"
                     },
                     {
-                      "bytes": "c382de3fe046dfa52d505aaff7edb01fbd0c9334f6769260d7c2c18ea6795a51"
+                      "bytes": "c640aa4f966a9c83a999181c3769a040c728917cdbfd54dc6f914b5b15693df8"
                     }
                   ]
                 },

From ac47f1f3adf14737b4b36e60f2e3f520385101f6 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 15:05:47 +0100
Subject: [PATCH 02/12] =?UTF-8?q?fix:=20address=20review=20findings=20?=
 =?UTF-8?q?=E2=80=94=20MAX=5FWINNERS=5FPER=5FSELECT=20cap,=20reputation=5F?=
 =?UTF-8?q?bump=20storage,=20in-place=20claim=20update,=20DataKey=20orderi?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Reduce MAX_WINNERS_PER_SELECT from 5,000 to 500 (compatible with
  table-backed storage + linear scans in claim_prize)
- Add reputation_bump field to Winner struct, stored from WinnerSpec
  during select_winners; remove caller-supplied param from both
  claim_prize and claim_milestone (manager-approved value only)
- claim_prize updates anchor row in-place via set_winner_at instead of
  appending duplicate Winner rows; claim_milestone preserves append
  for multi-milestone support
- Move PrizeClaimed variant to end of DataKey enum so existing key
  discriminants remain stable on upgrade
- All 197 tests pass, wasm build clean
---
 contracts/events/src/event_ops.rs             | 32 ++++++-----
 contracts/events/src/grant.rs                 |  8 ++-
 contracts/events/src/lib.rs                   |  6 +--
 contracts/events/src/storage.rs               |  6 +++
 contracts/events/src/tests/bounty_pillar.rs   |  2 +-
 contracts/events/src/tests/cancel_refund.rs   |  2 +-
 contracts/events/src/tests/contributions.rs   |  2 +-
 contracts/events/src/tests/cross_contract.rs  | 53 ++++++++-----------
 contracts/events/src/tests/crowdfunding.rs    | 22 ++++----
 contracts/events/src/tests/escrow_fee_math.rs | 44 +++++++--------
 contracts/events/src/tests/grant_pillar.rs    | 38 ++++++-------
 .../events/src/tests/hackathon_pillar.rs      | 40 ++++++--------
 contracts/events/src/types.rs                 |  6 ++-
 13 files changed, 130 insertions(+), 131 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index a6b6370..bf5f635 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -22,11 +22,11 @@ const MAX_TITLE_LEN: u32 = 120;
 // Max winners per select_winners call. With the pull-model (2026-07),
 // select_winners only records winners (1 storage write each) and defers
 // all token transfers + cross-contract calls to per-winner claim_prize
-// transactions. This makes the per-winner cost negligible, so the cap is
-// raised from 50 to 5_000 (matching MAX_APPLICANTS_PER_EVENT / MAX_CONTRIBUTORS_PER_EVENT
-// for consistency). The practical ceiling is now the storage footprint of
-// the winner list rather than the per-tx execution budget.
-pub const MAX_WINNERS_PER_SELECT: u32 = 5_000;
+// transactions. However, claim_prize still performs a linear scan of the
+// winner list to locate the anchor row, and get_winners loads all rows
+// into a Vec. Without keyed winner lookup or batched recording, 500 is a
+// safe ceiling compatible with the current table-backed implementation.
+pub const MAX_WINNERS_PER_SELECT: u32 = 500;
 
 pub const MAX_APPLICANTS_PER_EVENT: u32 = 5_000;
 pub const MAX_CONTRIBUTORS_PER_EVENT: u32 = 5_000;
@@ -152,6 +152,7 @@ pub fn create_event(env: &Env, params: CreateEventParams, op_id: BytesN<32>) ->
                 amount: 0,
                 milestone: None,
                 paid_at: None,
+                reputation_bump: 0,
             },
         );
     }
@@ -624,7 +625,8 @@ pub fn select_winners(
                         position: spec.position,
                         amount,
                         milestone: None,
-                        paid_at: None, // set by claim_prize
+                        paid_at: None,
+                        reputation_bump: spec.reputation_bump,
                     },
                 );
             }
@@ -640,6 +642,7 @@ pub fn select_winners(
                         amount: 0,
                         milestone: None,
                         paid_at: None,
+                        reputation_bump: spec.reputation_bump,
                     },
                 );
             }
@@ -675,7 +678,6 @@ pub fn claim_prize(
     event_id: u64,
     recipient: Address,
     position: u32,
-    reputation_bump: u32,
     op_id: BytesN<32>,
 ) -> Result<(), Error> {
     admin::require_not_paused(env)?;
@@ -700,9 +702,10 @@ pub fn claim_prize(
     }
 
     // Locate the anchor row (milestone == None) matching this recipient and
-    // position. The amount was pre-computed in select_winners.
+    // position. Captures the index for in-place update, the pre-computed
+    // amount, and the manager-approved reputation_bump.
     let count = storage::winner_count(env, event_id);
-    let mut winner_amount: Option<i128> = None;
+    let mut winner_info: Option<(u32, i128, u32)> = None;
     for idx in 0..count {
         let w = match storage::winner_at(env, event_id, idx) {
             Some(w) => w,
@@ -712,11 +715,11 @@ pub fn claim_prize(
             continue;
         }
         if w.milestone.is_none() {
-            winner_amount = Some(w.amount);
+            winner_info = Some((idx, w.amount, w.reputation_bump));
             break;
         }
     }
-    let amount = winner_amount.ok_or(Error::NoSubmissions)?;
+    let (anchor_idx, amount, reputation_bump) = winner_info.ok_or(Error::NoSubmissions)?;
 
     if amount <= 0 {
         return Err(Error::InvalidDistribution);
@@ -745,16 +748,19 @@ pub fn claim_prize(
     // Mark prize claimed (prevents replay for this recipient + position).
     storage::mark_prize_claimed(env, event_id, &recipient, position);
 
-    // Append per-claim Winner row.
-    storage::append_winner(
+    // Update the anchor row in-place with the paid timestamp instead of
+    // appending a duplicate row. This keeps winner_count == selected count.
+    storage::set_winner_at(
         env,
         event_id,
+        anchor_idx,
         &Winner {
             recipient: recipient.clone(),
             position,
             amount,
             milestone: None,
             paid_at: Some(env.ledger().timestamp()),
+            reputation_bump,
         },
     );
 
diff --git a/contracts/events/src/grant.rs b/contracts/events/src/grant.rs
index e33b893..988471e 100644
--- a/contracts/events/src/grant.rs
+++ b/contracts/events/src/grant.rs
@@ -24,7 +24,6 @@ pub fn claim_milestone(
     event_id: u64,
     recipient: Address,
     milestone: u32,
-    reputation_bump: u32,
     op_id: BytesN<32>,
 ) -> Result<(), Error> {
     admin::require_not_paused(env)?;
@@ -57,6 +56,7 @@ pub fn claim_milestone(
 
     let count = storage::winner_count(env, event_id);
     let mut winner_position: Option<u32> = None;
+    let mut reputation_bump: u32 = 0;
     let mut already_claimed_for_recipient: u32 = 0;
     let mut already_paid_to_recipient: i128 = 0;
     for idx in 0..count {
@@ -68,7 +68,10 @@ pub fn claim_milestone(
             continue;
         }
         match w.milestone {
-            None => winner_position = Some(w.position),
+            None => {
+                winner_position = Some(w.position);
+                reputation_bump = w.reputation_bump;
+            }
             Some(_) => {
                 already_claimed_for_recipient = already_claimed_for_recipient.saturating_add(1);
                 already_paid_to_recipient = already_paid_to_recipient.saturating_add(w.amount);
@@ -147,6 +150,7 @@ pub fn claim_milestone(
             amount,
             milestone: Some(milestone),
             paid_at: Some(env.ledger().timestamp()),
+            reputation_bump,
         },
     );
 
diff --git a/contracts/events/src/lib.rs b/contracts/events/src/lib.rs
index 9c2a476..7099eb4 100644
--- a/contracts/events/src/lib.rs
+++ b/contracts/events/src/lib.rs
@@ -232,10 +232,9 @@ impl EventsContract {
         event_id: u64,
         recipient: Address,
         position: u32,
-        reputation_bump: u32,
         op_id: BytesN<32>,
     ) -> Result<(), Error> {
-        event_ops::claim_prize(&env, event_id, recipient, position, reputation_bump, op_id)
+        event_ops::claim_prize(&env, event_id, recipient, position, op_id)
     }
 
     pub fn claim_milestone(
@@ -243,10 +242,9 @@ impl EventsContract {
         event_id: u64,
         recipient: Address,
         milestone: u32,
-        reputation_bump: u32,
         op_id: BytesN<32>,
     ) -> Result<(), Error> {
-        grant::claim_milestone(&env, event_id, recipient, milestone, reputation_bump, op_id)
+        grant::claim_milestone(&env, event_id, recipient, milestone, op_id)
     }
 
     // ============================================================
diff --git a/contracts/events/src/storage.rs b/contracts/events/src/storage.rs
index aa85278..f1227fb 100644
--- a/contracts/events/src/storage.rs
+++ b/contracts/events/src/storage.rs
@@ -433,6 +433,12 @@ pub fn winner_at(env: &Env, id: u64, idx: u32) -> Option<Winner> {
     w
 }
 
+pub fn set_winner_at(env: &Env, id: u64, idx: u32, w: &Winner) {
+    let key = DataKey::EventWinnerAt(id, idx);
+    env.storage().persistent().set(&key, w);
+    touch_event_persistent(env, &key);
+}
+
 pub fn append_winner(env: &Env, id: u64, w: &Winner) {
     let cur = winner_count(env, id);
     let at_key = DataKey::EventWinnerAt(id, cur);
diff --git a/contracts/events/src/tests/bounty_pillar.rs b/contracts/events/src/tests/bounty_pillar.rs
index ed26771..77efa1c 100644
--- a/contracts/events/src/tests/bounty_pillar.rs
+++ b/contracts/events/src/tests/bounty_pillar.rs
@@ -267,7 +267,7 @@ fn apply_on_completed_event_reverts() {
 
     // Pull-model: claim prize to drain escrow and complete the event.
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &0_u32, &claim_op);
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
 
     let event = ctx.events.get_event(&bounty_id);
     assert_eq!(event.status, EventStatus::Completed);
diff --git a/contracts/events/src/tests/cancel_refund.rs b/contracts/events/src/tests/cancel_refund.rs
index ccfa7da..33c49c4 100644
--- a/contracts/events/src/tests/cancel_refund.rs
+++ b/contracts/events/src/tests/cancel_refund.rs
@@ -439,7 +439,7 @@ fn cancel_prorata_splits_remaining_across_partners_no_owner_residual() {
         .select_winners(&id, &winners, &BytesN::random(&ctx.env));
 
     // Pull-model: claim prize to drain escrow (60% of 2000 = 1200).
-    ctx.events.claim_prize(&id, &w, &1_u32, &0_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w, &1_u32, &BytesN::random(&ctx.env));
 
     let p1_before = token.balance(&p1);
     let p2_before = token.balance(&p2);
diff --git a/contracts/events/src/tests/contributions.rs b/contracts/events/src/tests/contributions.rs
index 3d69fb1..ce2c06e 100644
--- a/contracts/events/src/tests/contributions.rs
+++ b/contracts/events/src/tests/contributions.rs
@@ -368,7 +368,7 @@ fn cancel_at_boundary_pays_partners_full_no_owner_residual() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op_select);
 
-    ctx.events.claim_prize(&id, &winner_a, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
 
     let after_select = ctx.events.get_event(&id);
     assert_eq!(after_select.status, EventStatus::Active);
diff --git a/contracts/events/src/tests/cross_contract.rs b/contracts/events/src/tests/cross_contract.rs
index 47d7ece..1be4205 100644
--- a/contracts/events/src/tests/cross_contract.rs
+++ b/contracts/events/src/tests/cross_contract.rs
@@ -123,7 +123,7 @@ fn select_winners_pays_recipient_and_bumps_profile() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &50_u32, &claim_op);
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET);
@@ -140,19 +140,13 @@ fn select_winners_pays_recipient_and_bumps_profile() {
     assert_eq!(event.remaining_escrow, 0);
 
     let winner_list = ctx.events.get_winners(&bounty_id);
-    assert_eq!(winner_list.len(), 2);
-    let anchor = winner_list.get(0).unwrap();
-    assert_eq!(anchor.recipient, ctx.applicant);
-    assert_eq!(anchor.position, 1);
-    assert_eq!(anchor.amount, TOTAL_BUDGET);
-    assert_eq!(anchor.milestone, None);
-    assert!(anchor.paid_at.is_none());
-    let claim = winner_list.get(1).unwrap();
-    assert_eq!(claim.recipient, ctx.applicant);
-    assert_eq!(claim.position, 1);
-    assert_eq!(claim.amount, TOTAL_BUDGET);
-    assert_eq!(claim.milestone, None);
-    assert!(claim.paid_at.is_some());
+    assert_eq!(winner_list.len(), 1);
+    let row = winner_list.get(0).unwrap();
+    assert_eq!(row.recipient, ctx.applicant);
+    assert_eq!(row.position, 1);
+    assert_eq!(row.amount, TOTAL_BUDGET);
+    assert_eq!(row.milestone, None);
+    assert!(row.paid_at.is_some());
 }
 
 #[test]
@@ -261,8 +255,8 @@ fn select_winners_handles_multi_recipient_distribution() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     // Pull-model: each winner claims their prize.
-    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &50_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&bounty_id, &winner_b, &2_u32, &25_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&bounty_id, &winner_b, &2_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let amount_a = TOTAL_BUDGET * 60 / 100;
@@ -371,7 +365,7 @@ fn cancel_after_select_winners_refunds_only_remaining() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &50_u32, &claim_op);
+    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &claim_op);
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let owner_before = token.balance(&ctx.owner);
@@ -416,7 +410,7 @@ fn select_grant_winner(ctx: &Ctx, grant_id: u64, recipient: &Address) {
         WinnerSpec {
             recipient: recipient.clone(),
             position: 1,
-            reputation_bump: 0,
+            reputation_bump: 5,
         },
     ];
     let op_select = BytesN::random(&ctx.env);
@@ -435,7 +429,7 @@ fn claim_milestone_pays_per_milestone_amount() {
 
     let op_claim = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&grant_id, &recipient, &0_u32, &5_u32, &op_claim);
+        .claim_milestone(&grant_id, &recipient, &0_u32, &op_claim);
 
     let per_milestone = TOTAL_BUDGET / 4;
     assert_eq!(token.balance(&recipient) - recipient_before, per_milestone);
@@ -460,17 +454,17 @@ fn claim_milestone_idempotent_per_recipient_and_milestone() {
 
     let op1 = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&grant_id, &recipient, &0_u32, &5_u32, &op1);
+        .claim_milestone(&grant_id, &recipient, &0_u32, &op1);
 
     let op2 = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&grant_id, &recipient, &0_u32, &5_u32, &op2);
+        .try_claim_milestone(&grant_id, &recipient, &0_u32, &op2);
     assert!(res.is_err(), "same milestone twice should revert");
 
     let op3 = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&grant_id, &recipient, &1_u32, &5_u32, &op3);
+        .claim_milestone(&grant_id, &recipient, &1_u32, &op3);
 }
 
 #[test]
@@ -483,7 +477,7 @@ fn claim_milestone_invalid_milestone_index_reverts() {
     let op = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&grant_id, &recipient, &4_u32, &5_u32, &op);
+        .try_claim_milestone(&grant_id, &recipient, &4_u32, &op);
     assert!(res.is_err(), "out-of-range milestone should revert");
 }
 
@@ -507,7 +501,7 @@ fn claim_milestone_rejects_non_grant_events() {
     let op = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&bounty_id2, &ctx.applicant, &0_u32, &5_u32, &op);
+        .try_claim_milestone(&bounty_id2, &ctx.applicant, &0_u32, &op);
     assert!(res.is_err(), "claim on Single-release event should revert");
 }
 
@@ -520,14 +514,14 @@ fn claim_milestone_final_milestone_marks_event_completed() {
 
     let op_a = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&grant_id, &recipient, &0_u32, &5_u32, &op_a);
+        .claim_milestone(&grant_id, &recipient, &0_u32, &op_a);
 
     let mid = ctx.events.get_event(&grant_id);
     assert_eq!(mid.status, EventStatus::Active);
 
     let op_b = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&grant_id, &recipient, &1_u32, &5_u32, &op_b);
+        .claim_milestone(&grant_id, &recipient, &1_u32, &op_b);
 
     let after = ctx.events.get_event(&grant_id);
     assert_eq!(after.status, EventStatus::Completed);
@@ -883,14 +877,12 @@ fn grant_last_milestone_sweeps_rounding_residue() {
         &grant_id,
         &recipient,
         &0_u32,
-        &5_u32,
         &BytesN::random(&ctx.env),
     );
     ctx.events.claim_milestone(
         &grant_id,
         &recipient,
         &1_u32,
-        &5_u32,
         &BytesN::random(&ctx.env),
     );
     let after_two = token.balance(&recipient);
@@ -900,7 +892,6 @@ fn grant_last_milestone_sweeps_rounding_residue() {
         &grant_id,
         &recipient,
         &2_u32,
-        &5_u32,
         &BytesN::random(&ctx.env),
     );
     let after_all = token.balance(&recipient);
@@ -948,7 +939,7 @@ fn select_winners_pays_against_remaining_escrow_including_top_ups() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     // Pull-model: claim prize.
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET + top_up);
@@ -1025,7 +1016,7 @@ fn manager_override_can_select_winners() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &0_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &BytesN::random(&ctx.env));
 
     let event = ctx.events.get_event(&bounty_id);
     assert_eq!(event.status, EventStatus::Completed);
diff --git a/contracts/events/src/tests/crowdfunding.rs b/contracts/events/src/tests/crowdfunding.rs
index 7c281a3..266e186 100644
--- a/contracts/events/src/tests/crowdfunding.rs
+++ b/contracts/events/src/tests/crowdfunding.rs
@@ -257,14 +257,14 @@ fn claim_milestone_splits_evenly_and_charges_fee_at_release() {
 
     let op_m0 = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &0_u32, &op_m0);
+        .claim_milestone(&id, &ctx.builder, &0_u32, &op_m0);
     assert_eq!(token.balance(&ctx.builder), 292_5000000_i128);
     assert_eq!(token.balance(&ctx.fee_account) - fee_before, 7_5000000_i128);
     assert_eq!(ctx.events.get_event(&id).remaining_escrow, 600_0000000_i128);
 
     let op_m1 = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &1_u32, &0_u32, &op_m1);
+        .claim_milestone(&id, &ctx.builder, &1_u32, &op_m1);
     assert_eq!(token.balance(&ctx.builder), 585_0000000_i128);
     assert_eq!(
         token.balance(&ctx.fee_account) - fee_before,
@@ -274,7 +274,7 @@ fn claim_milestone_splits_evenly_and_charges_fee_at_release() {
 
     let op_m2 = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &2_u32, &0_u32, &op_m2);
+        .claim_milestone(&id, &ctx.builder, &2_u32, &op_m2);
     assert_eq!(token.balance(&ctx.builder), 877_5000000_i128);
     assert_eq!(
         token.balance(&ctx.fee_account) - fee_before,
@@ -298,7 +298,7 @@ fn claim_milestone_last_drains_dust_with_fee() {
 
     for m in 0u32..3 {
         let op = BytesN::random(&ctx.env);
-        ctx.events.claim_milestone(&id, &ctx.builder, &m, &0, &op);
+        ctx.events.claim_milestone(&id, &ctx.builder, &m, &op);
     }
 
     let builder_delta = token.balance(&ctx.builder) - builder_before;
@@ -323,11 +323,11 @@ fn claim_milestone_replay_reverts() {
 
     let op = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &0, &op);
+        .claim_milestone(&id, &ctx.builder, &0_u32, &op);
 
     let res = ctx
         .events
-        .try_claim_milestone(&id, &ctx.builder, &0_u32, &0, &op);
+        .try_claim_milestone(&id, &ctx.builder, &0_u32, &op);
     assert!(res.is_err());
 }
 
@@ -341,7 +341,7 @@ fn claim_milestone_out_of_range_reverts() {
     let op = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&id, &ctx.builder, &2_u32, &0, &op);
+        .try_claim_milestone(&id, &ctx.builder, &2_u32, &op);
     assert!(res.is_err());
 }
 
@@ -352,7 +352,7 @@ fn claim_milestone_with_empty_escrow_reverts() {
     let op = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&id, &ctx.builder, &0_u32, &0, &op);
+        .try_claim_milestone(&id, &ctx.builder, &0_u32, &op);
     assert!(res.is_err());
 }
 
@@ -385,7 +385,7 @@ fn backer_pays_exactly_pledge_and_creator_bears_fee() {
 
     let claim = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &0, &claim);
+        .claim_milestone(&id, &ctx.builder, &0_u32, &claim);
 
     let fee = pledge * FEE_BPS as i128 / 10_000_i128; // 2.5 USDC
     assert_eq!(
@@ -492,7 +492,7 @@ fn cancel_after_partial_claim_pro_rates_remaining() {
 
     let op_m0 = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &0, &op_m0);
+        .claim_milestone(&id, &ctx.builder, &0_u32, &op_m0);
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let p1_before = token.balance(&p1);
@@ -521,7 +521,7 @@ fn crowdfunding_claim_milestone_requires_admin_auth() {
 
     let op = BytesN::random(&ctx.env);
     ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &0, &op);
+        .claim_milestone(&id, &ctx.builder, &0_u32, &op);
 
     let auths = ctx.env.auths();
     let admin_required = auths.iter().any(|(addr, _)| *addr == ctx.events_admin);
diff --git a/contracts/events/src/tests/escrow_fee_math.rs b/contracts/events/src/tests/escrow_fee_math.rs
index e9d6785..fc88e05 100644
--- a/contracts/events/src/tests/escrow_fee_math.rs
+++ b/contracts/events/src/tests/escrow_fee_math.rs
@@ -380,7 +380,7 @@ fn single_release_pays_full_escrow_for_100_percent() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &winner, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&winner), TOTAL_BUDGET);
@@ -422,9 +422,9 @@ fn multi_position_split_pays_correct_amounts() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &w1, &1_u32, &50_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w2, &2_u32, &30_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w3, &3_u32, &20_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let escrow = TOTAL_BUDGET; // all positions filled at create time
@@ -469,9 +469,9 @@ fn three_way_33_33_34_split_rounding() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &w1, &1_u32, &50_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w2, &2_u32, &30_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w3, &3_u32, &20_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let escrow = TOTAL_BUDGET;
@@ -503,7 +503,7 @@ fn partial_position_fill_leaves_residual_escrow() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &w1, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&w1), TOTAL_BUDGET * 60 / 100);
@@ -546,7 +546,7 @@ fn partner_funds_grow_winner_payout() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &winner, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&winner), escrow_at_select);
@@ -579,15 +579,15 @@ fn grant_milestone_pays_floored_per_milestone() {
     let per_milestone = TOTAL_BUDGET / milestones as i128;
 
     let op_m0 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &recipient, &0, &50, &op_m0);
+    ctx.events.claim_milestone(&id, &recipient, &0, &op_m0);
     assert_eq!(token.balance(&recipient), per_milestone);
 
     let op_m1 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &recipient, &1, &50, &op_m1);
+    ctx.events.claim_milestone(&id, &recipient, &1, &op_m1);
     assert_eq!(token.balance(&recipient), per_milestone * 2);
 
     let op_m2 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &recipient, &2, &50, &op_m2);
+    ctx.events.claim_milestone(&id, &recipient, &2, &op_m2);
     assert_eq!(
         token.balance(&recipient),
         TOTAL_BUDGET,
@@ -616,12 +616,12 @@ fn grant_milestone_double_claim_rejected() {
     ctx.events.select_winners(&id, &winners, &op_sel);
 
     let op_m0 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &recipient, &0, &50, &op_m0);
+    ctx.events.claim_milestone(&id, &recipient, &0, &op_m0);
 
     let op_m0_dup = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&id, &recipient, &0, &50, &op_m0_dup);
+        .try_claim_milestone(&id, &recipient, &0, &op_m0_dup);
     assert!(res.is_err(), "double claim_milestone must revert");
 }
 
@@ -646,7 +646,7 @@ fn grant_milestone_out_of_range_rejected() {
     let op = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&id, &recipient, &2, &50, &op);
+        .try_claim_milestone(&id, &recipient, &2, &op);
     assert!(res.is_err(), "milestone >= total_milestones must revert");
 }
 
@@ -691,18 +691,18 @@ fn crowdfunding_dynamic_milestone_split() {
     let net_per_milestone = milestone_amount - milestone_fee;
 
     let op_m0 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &ctx.owner, &0, &50, &op_m0);
+    ctx.events.claim_milestone(&id, &ctx.owner, &0, &op_m0);
     assert_eq!(token.balance(&ctx.owner) - owner_before, net_per_milestone);
 
     let op_m1 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &ctx.owner, &1, &50, &op_m1);
+    ctx.events.claim_milestone(&id, &ctx.owner, &1, &op_m1);
     assert_eq!(
         token.balance(&ctx.owner) - owner_before,
         net_per_milestone * 2
     );
 
     let op_m2 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &ctx.owner, &2, &50, &op_m2);
+    ctx.events.claim_milestone(&id, &ctx.owner, &2, &op_m2);
     assert_eq!(
         token.balance(&ctx.owner) - owner_before,
         net_per_milestone * 3
@@ -742,17 +742,17 @@ fn crowdfunding_dynamic_rounding_no_dust() {
     ctx.events.add_funds(&id, &backer, &raised, &op_fund);
 
     let op_m0 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &ctx.owner, &0, &50, &op_m0);
+    ctx.events.claim_milestone(&id, &ctx.owner, &0, &op_m0);
     let event = ctx.events.get_event(&id);
     assert_eq!(event.remaining_escrow, 666_6666668);
 
     let op_m1 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &ctx.owner, &1, &50, &op_m1);
+    ctx.events.claim_milestone(&id, &ctx.owner, &1, &op_m1);
     let event = ctx.events.get_event(&id);
     assert_eq!(event.remaining_escrow, 333_3333334);
 
     let op_m2 = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &ctx.owner, &2, &50, &op_m2);
+    ctx.events.claim_milestone(&id, &ctx.owner, &2, &op_m2);
     let event = ctx.events.get_event(&id);
     assert_eq!(event.remaining_escrow, 0);
 }
@@ -1055,7 +1055,7 @@ fn fee_and_winner_balances_consistent() {
     ];
     let op_sel = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op_sel);
-    ctx.events.claim_prize(&id, &winner, &1_u32, &50_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
 
     assert_eq!(token.balance(&winner), escrow);
     assert_eq!(token.balance(&ctx.fee_account), create_fee + contrib_fee);
diff --git a/contracts/events/src/tests/grant_pillar.rs b/contracts/events/src/tests/grant_pillar.rs
index 40db2a0..89bea1e 100644
--- a/contracts/events/src/tests/grant_pillar.rs
+++ b/contracts/events/src/tests/grant_pillar.rs
@@ -95,7 +95,7 @@ fn select_winner(ctx: &Ctx, id: u64, recipient: &Address) {
         WinnerSpec {
             recipient: recipient.clone(),
             position: 1,
-            reputation_bump: 0
+            reputation_bump: 10
         },
     ];
     ctx.events
@@ -176,7 +176,7 @@ fn claim_milestone_pays_fixed_per_milestone_amount() {
     let fee_before = token.balance(&ctx.fee_account);
 
     ctx.events
-        .claim_milestone(&id, &recipient, &0_u32, &5_u32, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &0_u32, &BytesN::random(&ctx.env));
 
     let per_milestone = TOTAL_BUDGET / 4;
     assert_eq!(token.balance(&recipient) - before, per_milestone);
@@ -201,13 +201,13 @@ fn claim_milestone_last_sweeps_rounding_residue() {
     let floored = TOTAL_BUDGET / 3;
 
     ctx.events
-        .claim_milestone(&id, &recipient, &0_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &0_u32, &BytesN::random(&ctx.env));
     ctx.events
-        .claim_milestone(&id, &recipient, &1_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &1_u32, &BytesN::random(&ctx.env));
     assert_eq!(token.balance(&recipient) - before, floored * 2);
 
     ctx.events
-        .claim_milestone(&id, &recipient, &2_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &2_u32, &BytesN::random(&ctx.env));
     assert_eq!(token.balance(&recipient) - before, TOTAL_BUDGET);
     assert_eq!(token.balance(&ctx.fee_account) - fee_before, 0);
 
@@ -224,11 +224,11 @@ fn claim_milestone_marks_completed_on_last() {
     select_winner(&ctx, id, &recipient);
 
     ctx.events
-        .claim_milestone(&id, &recipient, &0_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &0_u32, &BytesN::random(&ctx.env));
     assert_eq!(ctx.events.get_event(&id).status, EventStatus::Active);
 
     ctx.events
-        .claim_milestone(&id, &recipient, &1_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &1_u32, &BytesN::random(&ctx.env));
     assert_eq!(ctx.events.get_event(&id).status, EventStatus::Completed);
 }
 
@@ -244,7 +244,7 @@ fn claim_milestone_earns_credits_and_bumps_reputation() {
     select_winner(&ctx, id, &recipient);
 
     ctx.events
-        .claim_milestone(&id, &recipient, &0_u32, &10_u32, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &0_u32, &BytesN::random(&ctx.env));
 
     let profile = ctx.profile.get_profile(&recipient).unwrap();
     assert_eq!(profile.reputation, 10);
@@ -268,10 +268,10 @@ fn claim_milestone_already_claimed_reverts() {
     select_winner(&ctx, id, &recipient);
 
     ctx.events
-        .claim_milestone(&id, &recipient, &0_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &recipient, &0_u32, &BytesN::random(&ctx.env));
     assert!(ctx
         .events
-        .try_claim_milestone(&id, &recipient, &0_u32, &0, &BytesN::random(&ctx.env))
+        .try_claim_milestone(&id, &recipient, &0_u32, &BytesN::random(&ctx.env))
         .is_err());
 }
 
@@ -283,7 +283,7 @@ fn claim_milestone_out_of_range_reverts() {
     select_winner(&ctx, id, &recipient);
     assert!(ctx
         .events
-        .try_claim_milestone(&id, &recipient, &3_u32, &0, &BytesN::random(&ctx.env))
+        .try_claim_milestone(&id, &recipient, &3_u32, &BytesN::random(&ctx.env))
         .is_err());
 }
 
@@ -294,7 +294,7 @@ fn claim_milestone_without_being_winner_reverts() {
     let non_winner = Address::generate(&ctx.env);
     assert!(ctx
         .events
-        .try_claim_milestone(&id, &non_winner, &0_u32, &0, &BytesN::random(&ctx.env))
+        .try_claim_milestone(&id, &non_winner, &0_u32, &BytesN::random(&ctx.env))
         .is_err());
 }
 
@@ -318,7 +318,7 @@ fn claim_milestone_on_single_release_reverts() {
     let r = Address::generate(&ctx.env);
     assert!(ctx
         .events
-        .try_claim_milestone(&id, &r, &0_u32, &0, &BytesN::random(&ctx.env))
+        .try_claim_milestone(&id, &r, &0_u32, &BytesN::random(&ctx.env))
         .is_err());
 }
 
@@ -330,10 +330,10 @@ fn claim_milestone_op_replay_reverts() {
     select_winner(&ctx, id, &recipient);
 
     let op = BytesN::random(&ctx.env);
-    ctx.events.claim_milestone(&id, &recipient, &0_u32, &0, &op);
+    ctx.events.claim_milestone(&id, &recipient, &0_u32, &op);
     assert!(ctx
         .events
-        .try_claim_milestone(&id, &recipient, &0_u32, &0, &op)
+        .try_claim_milestone(&id, &recipient, &0_u32, &op)
         .is_err());
 }
 
@@ -386,13 +386,13 @@ fn two_winner_grant_each_claims_their_share() {
     let fee_before = token.balance(&ctx.fee_account);
 
     ctx.events
-        .claim_milestone(&id, &w1, &0_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &w1, &0_u32, &BytesN::random(&ctx.env));
     ctx.events
-        .claim_milestone(&id, &w1, &1_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
     ctx.events
-        .claim_milestone(&id, &w2, &0_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &w2, &0_u32, &BytesN::random(&ctx.env));
     ctx.events
-        .claim_milestone(&id, &w2, &1_u32, &0, &BytesN::random(&ctx.env));
+        .claim_milestone(&id, &w2, &1_u32, &BytesN::random(&ctx.env));
 
     assert_eq!(token.balance(&w1) - w1_before, TOTAL_BUDGET * 60 / 100);
     assert_eq!(token.balance(&w2) - w2_before, TOTAL_BUDGET * 40 / 100);
diff --git a/contracts/events/src/tests/hackathon_pillar.rs b/contracts/events/src/tests/hackathon_pillar.rs
index 0a5d2a6..44b32c0 100644
--- a/contracts/events/src/tests/hackathon_pillar.rs
+++ b/contracts/events/src/tests/hackathon_pillar.rs
@@ -308,7 +308,7 @@ fn select_winners_single_recipient_sweeps_escrow() {
 
     // Pull-model: claim prize in winner's own transaction.
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &50_u32, &claim_op);
+    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
 
     assert_eq!(token.balance(&ctx.applicant) - winner_before, TOTAL_BUDGET);
     assert_eq!(token.balance(&ctx.fee_account) - fee_before, 0);
@@ -324,23 +324,15 @@ fn select_winners_single_recipient_sweeps_escrow() {
     assert_eq!(event.status, EventStatus::Completed);
     assert_eq!(event.remaining_escrow, 0);
 
-    // Two winner rows: anchor (from select_winners) + claim row (from claim_prize).
+    // Single winner row: anchor updated in-place by claim_prize with paid_at.
     let winner_list = ctx.events.get_winners(&id);
-    assert_eq!(winner_list.len(), 2);
-    // Anchor row (select_winners): recorded but unpaid.
-    let anchor = winner_list.get(0).unwrap();
-    assert_eq!(anchor.recipient, ctx.applicant);
-    assert_eq!(anchor.position, 1);
-    assert_eq!(anchor.amount, TOTAL_BUDGET);
-    assert!(anchor.milestone.is_none());
-    assert!(anchor.paid_at.is_none());
-    // Claim row (claim_prize): paid.
-    let claim = winner_list.get(1).unwrap();
-    assert_eq!(claim.recipient, ctx.applicant);
-    assert_eq!(claim.position, 1);
-    assert_eq!(claim.amount, TOTAL_BUDGET);
-    assert!(claim.milestone.is_none());
-    assert!(claim.paid_at.is_some());
+    assert_eq!(winner_list.len(), 1);
+    let row = winner_list.get(0).unwrap();
+    assert_eq!(row.recipient, ctx.applicant);
+    assert_eq!(row.position, 1);
+    assert_eq!(row.amount, TOTAL_BUDGET);
+    assert!(row.milestone.is_none());
+    assert!(row.paid_at.is_some());
 }
 
 #[test]
@@ -381,9 +373,9 @@ fn select_winners_multi_position_splits_by_distribution() {
     let amt_2 = TOTAL_BUDGET * 30 / 100;
     let amt_3 = TOTAL_BUDGET * 20 / 100;
 
-    ctx.events.claim_prize(&id, &first, &1_u32, &60_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &second, &2_u32, &40_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &third, &3_u32, &20_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &first, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &second, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(&id, &third, &3_u32, &BytesN::random(&ctx.env));
 
     assert_eq!(token.balance(&first), amt_1);
     assert_eq!(token.balance(&second), amt_2);
@@ -400,8 +392,8 @@ fn select_winners_multi_position_splits_by_distribution() {
     let event = ctx.events.get_event(&id);
     assert_eq!(event.status, EventStatus::Completed);
     assert_eq!(event.remaining_escrow, 0);
-    // 3 anchors + 3 claim rows = 6.
-    assert_eq!(ctx.events.get_winners(&id).len(), 6);
+    // 3 anchors updated in-place by claim_prize with paid_at.
+    assert_eq!(ctx.events.get_winners(&id).len(), 3);
 }
 
 // ============================================================
@@ -551,7 +543,7 @@ fn select_winners_on_completed_event_reverts() {
 
     // Claim to drain escrow and complete the event.
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &0_u32, &claim_op);
+    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
     assert_eq!(ctx.events.get_event(&id).status, EventStatus::Completed);
 
     let again = Address::generate(&ctx.env);
@@ -611,7 +603,7 @@ fn claim_milestone_on_single_release_hackathon_reverts() {
     let op = BytesN::random(&ctx.env);
     let res = ctx
         .events
-        .try_claim_milestone(&id, &ctx.applicant, &0_u32, &0_u32, &op);
+        .try_claim_milestone(&id, &ctx.applicant, &0_u32, &op);
     assert!(
         res.is_err(),
         "claim_milestone must reject a Single-release hackathon"
diff --git a/contracts/events/src/types.rs b/contracts/events/src/types.rs
index 273a805..dae172d 100644
--- a/contracts/events/src/types.rs
+++ b/contracts/events/src/types.rs
@@ -129,6 +129,7 @@ pub struct Winner {
     pub amount: i128,
     pub milestone: Option<u32>,
     pub paid_at: Option<u64>,
+    pub reputation_bump: u32,
 }
 
 // ============================================================
@@ -179,8 +180,6 @@ pub enum DataKey {
 
     MilestoneClaimed(u64, Address, u32),
 
-    PrizeClaimed(u64, Address, u32),
-
     CrowdfundingMilestonesClaimed(u64),
 
     CancellationState(u64),
@@ -197,6 +196,9 @@ pub enum DataKey {
 
     // Appended in 1.2.0 to preserve existing key discriminants.
     NonOwnerContributionTotal(u64),
+
+    // Added last so earlier variant discriminants remain stable on upgrade.
+    PrizeClaimed(u64, Address, u32),
 }
 
 // ============================================================

From 89db96520cabec8c51564a063458511f353269a5 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 15:12:58 +0100
Subject: [PATCH 03/12] fix: prevent cancel after select_winners for
 Single-release (pull-model)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Manager could call start_cancel immediately after select_winners,
draining escrow before winners call claim_prize — permanently
preventing payouts. Added has_unclaimed_single_winner() guard in
start_cancel that rejects cancellation when any anchor row has
paid_at: None. After all winners claim (anchors updated to
paid_at: Some(...)), cancellation of residual escrow still
permitted.
---
 contracts/events/src/event_ops.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index bf5f635..3dfe207 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -263,6 +263,21 @@ pub fn add_funds(
     Ok(())
 }
 
+/// True if the Single-release event has at least one winner anchor whose
+/// prize has not yet been claimed (`paid_at` is `None`).  The manager must
+/// not be able to cancel and drain the escrow before those winners claim.
+fn has_unclaimed_single_winner(env: &Env, event_id: u64) -> bool {
+    let count = storage::winner_count(env, event_id);
+    for idx in 0..count {
+        if let Some(w) = storage::winner_at(env, event_id, idx) {
+            if w.milestone.is_none() && w.paid_at.is_none() {
+                return true;
+            }
+        }
+    }
+    false
+}
+
 // ============================================================
 // PAGED CANCEL
 // ============================================================
@@ -278,6 +293,13 @@ pub fn start_cancel(env: &Env, event_id: u64, op_id: BytesN<32>) -> Result<(), E
         return Err(Error::CancellationAlreadyStarted);
     }
 
+    // Prevent cancel after winners selected for Single-release (pull-model).
+    // The manager must not be able to drain escrow before winners claim.
+    if matches!(event.release_kind, ReleaseKind::Single) && has_unclaimed_single_winner(env, event_id)
+    {
+        return Err(Error::WinnersAlreadySelected);
+    }
+
     resolve_manager(env, event_id, &event.owner).require_auth();
 
     let remaining = event.remaining_escrow;

From cfce78fc569b6bc3b8fe59e92f9f626739b5b941 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 15:23:38 +0100
Subject: [PATCH 04/12] fix: use anchor paid_at as canonical double-claim guard
 in claim_prize

The PrizeClaimed flag (fast-path) can TTL-expire while winner rows
stay live from get_winners/winner_at reads.  Added && paid_at.is_none()
to the anchor scan so a claimed anchor (paid_at: Some(...)) prevents
replay even if the separate flag has expired.
---
 contracts/events/src/event_ops.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index 3dfe207..9198d8a 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -736,7 +736,7 @@ pub fn claim_prize(
         if w.recipient != recipient || w.position != position {
             continue;
         }
-        if w.milestone.is_none() {
+        if w.milestone.is_none() && w.paid_at.is_none() {
             winner_info = Some((idx, w.amount, w.reputation_bump));
             break;
         }

From ac9be2d32dfc9c4fecd5e9647abd3c829b419a74 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 15:31:02 +0100
Subject: [PATCH 05/12] fix: Winner backward compat + O(1) claim_prize lookup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two findings from Almanax review:

1. Winner deserialization on upgrade (High): reputation_bump was
   added as a non-optional u32, which would brick reads of old on-chain
   Winner entries after upgrade. Changed to Option<u32> — old entries
   deserialize as None (treated as 0), new entries store Some(x).

2. Linear winner scan in claim_prize (Medium): claim_prize scanned all
   winners to find the anchor row, approaching budget limits at higher
   winner counts. Added DataKey::WinnerIndex stored at selection time
   for O(1) lookup in claim_prize.

- Winner.reputation_bump: u32 → Option<u32>
- DataKey::WinnerIndex variant + storage get/set helpers
- select_winners stores index + Some() reputation_bump
- claim_prize uses index lookup, falls back to PrizeAlreadyClaimed
  if paid_at.is_some() (canonical guard)
- claim_milestone uses .unwrap_or(0) on read, Some() on write
---
 contracts/events/src/event_ops.rs | 50 +++++++++++++++++--------------
 contracts/events/src/grant.rs     |  4 +--
 contracts/events/src/storage.rs   | 15 ++++++++++
 contracts/events/src/types.rs     |  5 +++-
 4 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index 9198d8a..797d293 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -152,7 +152,7 @@ pub fn create_event(env: &Env, params: CreateEventParams, op_id: BytesN<32>) ->
                 amount: 0,
                 milestone: None,
                 paid_at: None,
-                reputation_bump: 0,
+                reputation_bump: None,
             },
         );
     }
@@ -632,13 +632,14 @@ pub fn select_winners(
                 return Err(Error::InsufficientEscrow);
             }
 
-            for spec in winners.iter() {
+            for (i, spec) in winners.iter().enumerate() {
                 let percent = event
                     .winner_distribution
                     .get(spec.position)
                     .ok_or(Error::InvalidDistribution)? as i128;
                 let amount = escrow_at_select.saturating_mul(percent) / 100_i128;
 
+                let anchor_idx = existing_count + (i as u32);
                 storage::append_winner(
                     env,
                     event_id,
@@ -648,9 +649,16 @@ pub fn select_winners(
                         amount,
                         milestone: None,
                         paid_at: None,
-                        reputation_bump: spec.reputation_bump,
+                        reputation_bump: Some(spec.reputation_bump),
                     },
                 );
+                storage::set_winner_index(
+                    env,
+                    event_id,
+                    &spec.recipient,
+                    spec.position,
+                    anchor_idx,
+                );
             }
         }
         ReleaseKind::Multi(_) => {
@@ -664,7 +672,7 @@ pub fn select_winners(
                         amount: 0,
                         milestone: None,
                         paid_at: None,
-                        reputation_bump: spec.reputation_bump,
+                        reputation_bump: Some(spec.reputation_bump),
                     },
                 );
             }
@@ -723,25 +731,21 @@ pub fn claim_prize(
         return Err(Error::PrizeAlreadyClaimed);
     }
 
-    // Locate the anchor row (milestone == None) matching this recipient and
-    // position. Captures the index for in-place update, the pre-computed
-    // amount, and the manager-approved reputation_bump.
-    let count = storage::winner_count(env, event_id);
-    let mut winner_info: Option<(u32, i128, u32)> = None;
-    for idx in 0..count {
-        let w = match storage::winner_at(env, event_id, idx) {
-            Some(w) => w,
-            None => continue,
-        };
-        if w.recipient != recipient || w.position != position {
-            continue;
-        }
-        if w.milestone.is_none() && w.paid_at.is_none() {
-            winner_info = Some((idx, w.amount, w.reputation_bump));
-            break;
-        }
+    // Look up the anchor index stored at selection time (O(1) instead of
+    // a linear scan). Returns NoSubmissions if no winner matches or the
+    // prize has already been claimed (canonical guard: paid_at).
+    let anchor_idx = storage::get_winner_index(env, event_id, &recipient, position)
+        .ok_or(Error::NoSubmissions)?;
+    let w = storage::winner_at(env, event_id, anchor_idx)
+        .ok_or(Error::NoSubmissions)?;
+    if w.recipient != recipient || w.position != position || w.milestone.is_some() {
+        return Err(Error::NoSubmissions);
+    }
+    if w.paid_at.is_some() {
+        return Err(Error::PrizeAlreadyClaimed);
     }
-    let (anchor_idx, amount, reputation_bump) = winner_info.ok_or(Error::NoSubmissions)?;
+    let amount = w.amount;
+    let reputation_bump = w.reputation_bump.unwrap_or(0);
 
     if amount <= 0 {
         return Err(Error::InvalidDistribution);
@@ -782,7 +786,7 @@ pub fn claim_prize(
             amount,
             milestone: None,
             paid_at: Some(env.ledger().timestamp()),
-            reputation_bump,
+            reputation_bump: Some(reputation_bump),
         },
     );
 
diff --git a/contracts/events/src/grant.rs b/contracts/events/src/grant.rs
index 988471e..dec0dd7 100644
--- a/contracts/events/src/grant.rs
+++ b/contracts/events/src/grant.rs
@@ -70,7 +70,7 @@ pub fn claim_milestone(
         match w.milestone {
             None => {
                 winner_position = Some(w.position);
-                reputation_bump = w.reputation_bump;
+                reputation_bump = w.reputation_bump.unwrap_or(0);
             }
             Some(_) => {
                 already_claimed_for_recipient = already_claimed_for_recipient.saturating_add(1);
@@ -150,7 +150,7 @@ pub fn claim_milestone(
             amount,
             milestone: Some(milestone),
             paid_at: Some(env.ledger().timestamp()),
-            reputation_bump,
+            reputation_bump: Some(reputation_bump),
         },
     );
 
diff --git a/contracts/events/src/storage.rs b/contracts/events/src/storage.rs
index f1227fb..03a19cc 100644
--- a/contracts/events/src/storage.rs
+++ b/contracts/events/src/storage.rs
@@ -451,6 +451,21 @@ pub fn append_winner(env: &Env, id: u64, w: &Winner) {
     touch_event_persistent(env, &count_key);
 }
 
+pub fn set_winner_index(env: &Env, id: u64, recipient: &Address, position: u32, idx: u32) {
+    let key = DataKey::WinnerIndex(id, recipient.clone(), position);
+    env.storage().persistent().set(&key, &idx);
+    touch_event_persistent(env, &key);
+}
+
+pub fn get_winner_index(env: &Env, id: u64, recipient: &Address, position: u32) -> Option<u32> {
+    let key = DataKey::WinnerIndex(id, recipient.clone(), position);
+    let idx: Option<u32> = env.storage().persistent().get(&key);
+    if idx.is_some() {
+        touch_event_persistent(env, &key);
+    }
+    idx
+}
+
 pub fn winners_snapshot(env: &Env, id: u64, max: u32) -> Vec<Winner> {
     let count = winner_count(env, id);
     let upper = if count < max { count } else { max };
diff --git a/contracts/events/src/types.rs b/contracts/events/src/types.rs
index dae172d..76d3b90 100644
--- a/contracts/events/src/types.rs
+++ b/contracts/events/src/types.rs
@@ -129,7 +129,7 @@ pub struct Winner {
     pub amount: i128,
     pub milestone: Option<u32>,
     pub paid_at: Option<u64>,
-    pub reputation_bump: u32,
+    pub reputation_bump: Option<u32>,
 }
 
 // ============================================================
@@ -199,6 +199,9 @@ pub enum DataKey {
 
     // Added last so earlier variant discriminants remain stable on upgrade.
     PrizeClaimed(u64, Address, u32),
+
+    // Winner anchor index for O(1) claim_prize lookup (added 2026-07).
+    WinnerIndex(u64, Address, u32),
 }
 
 // ============================================================

From e02fde60f416907de1c56fcbc86533def8ad20de Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 15:35:23 +0100
Subject: [PATCH 06/12] fix: liveness escape hatch for start_cancel with
 unclaimed winners
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a Single-release winner cannot authenticate (lost key, contract
without signer), escrow is permanently locked — claim_prize requires
recipient auth and start_cancel rejects unclaimed winners.

Allow cancellation after the event deadline passes: the deadline is
the natural claim window. Winners who haven't claimed by then forfeit
their prize, and the manager can recover remaining escrow.
---
 contracts/events/src/event_ops.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index 797d293..1830d61 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -294,10 +294,17 @@ pub fn start_cancel(env: &Env, event_id: u64, op_id: BytesN<32>) -> Result<(), E
     }
 
     // Prevent cancel after winners selected for Single-release (pull-model).
-    // The manager must not be able to drain escrow before winners claim.
+    // The manager must not be able to drain escrow before winners claim,
+    // unless the event deadline has passed (liveness escape hatch for
+    // winners who cannot authenticate).
     if matches!(event.release_kind, ReleaseKind::Single) && has_unclaimed_single_winner(env, event_id)
     {
-        return Err(Error::WinnersAlreadySelected);
+        let deadline_passed = event
+            .deadline
+            .map_or(false, |d| env.ledger().timestamp() > d);
+        if !deadline_passed {
+            return Err(Error::WinnersAlreadySelected);
+        }
     }
 
     resolve_manager(env, event_id, &event.owner).require_auth();

From 84a386f8a3bf157cd976cc3026766938a31f68ee Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 19:19:29 +0100
Subject: [PATCH 07/12] style: cargo fmt

---
 contracts/events/src/event_ops.rs             |  6 +--
 contracts/events/src/tests/bounty_pillar.rs   |  3 +-
 contracts/events/src/tests/cancel_refund.rs   |  3 +-
 contracts/events/src/tests/contributions.rs   |  3 +-
 contracts/events/src/tests/cross_contract.rs  | 50 ++++++++++---------
 contracts/events/src/tests/crowdfunding.rs    |  6 +--
 contracts/events/src/tests/escrow_fee_math.rs | 34 ++++++++-----
 .../events/src/tests/hackathon_pillar.rs      | 15 ++++--
 8 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index 1830d61..7ee2e8a 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -297,7 +297,8 @@ pub fn start_cancel(env: &Env, event_id: u64, op_id: BytesN<32>) -> Result<(), E
     // The manager must not be able to drain escrow before winners claim,
     // unless the event deadline has passed (liveness escape hatch for
     // winners who cannot authenticate).
-    if matches!(event.release_kind, ReleaseKind::Single) && has_unclaimed_single_winner(env, event_id)
+    if matches!(event.release_kind, ReleaseKind::Single)
+        && has_unclaimed_single_winner(env, event_id)
     {
         let deadline_passed = event
             .deadline
@@ -743,8 +744,7 @@ pub fn claim_prize(
     // prize has already been claimed (canonical guard: paid_at).
     let anchor_idx = storage::get_winner_index(env, event_id, &recipient, position)
         .ok_or(Error::NoSubmissions)?;
-    let w = storage::winner_at(env, event_id, anchor_idx)
-        .ok_or(Error::NoSubmissions)?;
+    let w = storage::winner_at(env, event_id, anchor_idx).ok_or(Error::NoSubmissions)?;
     if w.recipient != recipient || w.position != position || w.milestone.is_some() {
         return Err(Error::NoSubmissions);
     }
diff --git a/contracts/events/src/tests/bounty_pillar.rs b/contracts/events/src/tests/bounty_pillar.rs
index 77efa1c..ab3e9e4 100644
--- a/contracts/events/src/tests/bounty_pillar.rs
+++ b/contracts/events/src/tests/bounty_pillar.rs
@@ -267,7 +267,8 @@ fn apply_on_completed_event_reverts() {
 
     // Pull-model: claim prize to drain escrow and complete the event.
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
+    ctx.events
+        .claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
 
     let event = ctx.events.get_event(&bounty_id);
     assert_eq!(event.status, EventStatus::Completed);
diff --git a/contracts/events/src/tests/cancel_refund.rs b/contracts/events/src/tests/cancel_refund.rs
index 33c49c4..d66fa38 100644
--- a/contracts/events/src/tests/cancel_refund.rs
+++ b/contracts/events/src/tests/cancel_refund.rs
@@ -439,7 +439,8 @@ fn cancel_prorata_splits_remaining_across_partners_no_owner_residual() {
         .select_winners(&id, &winners, &BytesN::random(&ctx.env));
 
     // Pull-model: claim prize to drain escrow (60% of 2000 = 1200).
-    ctx.events.claim_prize(&id, &w, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w, &1_u32, &BytesN::random(&ctx.env));
 
     let p1_before = token.balance(&p1);
     let p2_before = token.balance(&p2);
diff --git a/contracts/events/src/tests/contributions.rs b/contracts/events/src/tests/contributions.rs
index ce2c06e..4d93013 100644
--- a/contracts/events/src/tests/contributions.rs
+++ b/contracts/events/src/tests/contributions.rs
@@ -368,7 +368,8 @@ fn cancel_at_boundary_pays_partners_full_no_owner_residual() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op_select);
 
-    ctx.events.claim_prize(&id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
 
     let after_select = ctx.events.get_event(&id);
     assert_eq!(after_select.status, EventStatus::Active);
diff --git a/contracts/events/src/tests/cross_contract.rs b/contracts/events/src/tests/cross_contract.rs
index 1be4205..91abc05 100644
--- a/contracts/events/src/tests/cross_contract.rs
+++ b/contracts/events/src/tests/cross_contract.rs
@@ -123,7 +123,8 @@ fn select_winners_pays_recipient_and_bumps_profile() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
+    ctx.events
+        .claim_prize(&bounty_id, &ctx.applicant, &1_u32, &claim_op);
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET);
@@ -255,8 +256,10 @@ fn select_winners_handles_multi_recipient_distribution() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     // Pull-model: each winner claims their prize.
-    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&bounty_id, &winner_b, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&bounty_id, &winner_a, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&bounty_id, &winner_b, &2_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let amount_a = TOTAL_BUDGET * 60 / 100;
@@ -365,7 +368,8 @@ fn cancel_after_select_winners_refunds_only_remaining() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&bounty_id, &winner_a, &1_u32, &claim_op);
+    ctx.events
+        .claim_prize(&bounty_id, &winner_a, &1_u32, &claim_op);
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let owner_before = token.balance(&ctx.owner);
@@ -873,27 +877,15 @@ fn grant_last_milestone_sweeps_rounding_residue() {
     let before = token.balance(&recipient);
 
     let floored = TOTAL_BUDGET / 3;
-    ctx.events.claim_milestone(
-        &grant_id,
-        &recipient,
-        &0_u32,
-        &BytesN::random(&ctx.env),
-    );
-    ctx.events.claim_milestone(
-        &grant_id,
-        &recipient,
-        &1_u32,
-        &BytesN::random(&ctx.env),
-    );
+    ctx.events
+        .claim_milestone(&grant_id, &recipient, &0_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_milestone(&grant_id, &recipient, &1_u32, &BytesN::random(&ctx.env));
     let after_two = token.balance(&recipient);
     assert_eq!(after_two - before, floored * 2);
 
-    ctx.events.claim_milestone(
-        &grant_id,
-        &recipient,
-        &2_u32,
-        &BytesN::random(&ctx.env),
-    );
+    ctx.events
+        .claim_milestone(&grant_id, &recipient, &2_u32, &BytesN::random(&ctx.env));
     let after_all = token.balance(&recipient);
     assert_eq!(
         after_all - before,
@@ -939,7 +931,12 @@ fn select_winners_pays_against_remaining_escrow_including_top_ups() {
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
     // Pull-model: claim prize.
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(
+        &bounty_id,
+        &ctx.applicant,
+        &1_u32,
+        &BytesN::random(&ctx.env),
+    );
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&ctx.applicant), TOTAL_BUDGET + top_up);
@@ -1016,7 +1013,12 @@ fn manager_override_can_select_winners() {
     let op_select = BytesN::random(&ctx.env);
     ctx.events.select_winners(&bounty_id, &winners, &op_select);
 
-    ctx.events.claim_prize(&bounty_id, &ctx.applicant, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events.claim_prize(
+        &bounty_id,
+        &ctx.applicant,
+        &1_u32,
+        &BytesN::random(&ctx.env),
+    );
 
     let event = ctx.events.get_event(&bounty_id);
     assert_eq!(event.status, EventStatus::Completed);
diff --git a/contracts/events/src/tests/crowdfunding.rs b/contracts/events/src/tests/crowdfunding.rs
index 266e186..d276029 100644
--- a/contracts/events/src/tests/crowdfunding.rs
+++ b/contracts/events/src/tests/crowdfunding.rs
@@ -322,8 +322,7 @@ fn claim_milestone_replay_reverts() {
     back(&ctx, id, &backer, 600_0000000_i128);
 
     let op = BytesN::random(&ctx.env);
-    ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &op);
+    ctx.events.claim_milestone(&id, &ctx.builder, &0_u32, &op);
 
     let res = ctx
         .events
@@ -520,8 +519,7 @@ fn crowdfunding_claim_milestone_requires_admin_auth() {
     back(&ctx, id, &p, 200_0000000_i128);
 
     let op = BytesN::random(&ctx.env);
-    ctx.events
-        .claim_milestone(&id, &ctx.builder, &0_u32, &op);
+    ctx.events.claim_milestone(&id, &ctx.builder, &0_u32, &op);
 
     let auths = ctx.env.auths();
     let admin_required = auths.iter().any(|(addr, _)| *addr == ctx.events_admin);
diff --git a/contracts/events/src/tests/escrow_fee_math.rs b/contracts/events/src/tests/escrow_fee_math.rs
index fc88e05..e163e1d 100644
--- a/contracts/events/src/tests/escrow_fee_math.rs
+++ b/contracts/events/src/tests/escrow_fee_math.rs
@@ -380,7 +380,8 @@ fn single_release_pays_full_escrow_for_100_percent() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&winner), TOTAL_BUDGET);
@@ -422,9 +423,12 @@ fn multi_position_split_pays_correct_amounts() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let escrow = TOTAL_BUDGET; // all positions filled at create time
@@ -469,9 +473,12 @@ fn three_way_33_33_34_split_rounding() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w2, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w3, &3_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     let escrow = TOTAL_BUDGET;
@@ -503,7 +510,8 @@ fn partial_position_fill_leaves_residual_escrow() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &w1, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&w1), TOTAL_BUDGET * 60 / 100);
@@ -546,7 +554,8 @@ fn partner_funds_grow_winner_payout() {
     ];
     let op = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op);
-    ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
 
     let token = token::Client::new(&ctx.env, &ctx.token_addr);
     assert_eq!(token.balance(&winner), escrow_at_select);
@@ -644,9 +653,7 @@ fn grant_milestone_out_of_range_rejected() {
     ctx.events.select_winners(&id, &winners, &op_sel);
 
     let op = BytesN::random(&ctx.env);
-    let res = ctx
-        .events
-        .try_claim_milestone(&id, &recipient, &2, &op);
+    let res = ctx.events.try_claim_milestone(&id, &recipient, &2, &op);
     assert!(res.is_err(), "milestone >= total_milestones must revert");
 }
 
@@ -1055,7 +1062,8 @@ fn fee_and_winner_balances_consistent() {
     ];
     let op_sel = BytesN::random(&ctx.env);
     ctx.events.select_winners(&id, &winners, &op_sel);
-    ctx.events.claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &winner, &1_u32, &BytesN::random(&ctx.env));
 
     assert_eq!(token.balance(&winner), escrow);
     assert_eq!(token.balance(&ctx.fee_account), create_fee + contrib_fee);
diff --git a/contracts/events/src/tests/hackathon_pillar.rs b/contracts/events/src/tests/hackathon_pillar.rs
index 44b32c0..685108a 100644
--- a/contracts/events/src/tests/hackathon_pillar.rs
+++ b/contracts/events/src/tests/hackathon_pillar.rs
@@ -308,7 +308,8 @@ fn select_winners_single_recipient_sweeps_escrow() {
 
     // Pull-model: claim prize in winner's own transaction.
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
+    ctx.events
+        .claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
 
     assert_eq!(token.balance(&ctx.applicant) - winner_before, TOTAL_BUDGET);
     assert_eq!(token.balance(&ctx.fee_account) - fee_before, 0);
@@ -373,9 +374,12 @@ fn select_winners_multi_position_splits_by_distribution() {
     let amt_2 = TOTAL_BUDGET * 30 / 100;
     let amt_3 = TOTAL_BUDGET * 20 / 100;
 
-    ctx.events.claim_prize(&id, &first, &1_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &second, &2_u32, &BytesN::random(&ctx.env));
-    ctx.events.claim_prize(&id, &third, &3_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &first, &1_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &second, &2_u32, &BytesN::random(&ctx.env));
+    ctx.events
+        .claim_prize(&id, &third, &3_u32, &BytesN::random(&ctx.env));
 
     assert_eq!(token.balance(&first), amt_1);
     assert_eq!(token.balance(&second), amt_2);
@@ -543,7 +547,8 @@ fn select_winners_on_completed_event_reverts() {
 
     // Claim to drain escrow and complete the event.
     let claim_op = BytesN::random(&ctx.env);
-    ctx.events.claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
+    ctx.events
+        .claim_prize(&id, &ctx.applicant, &1_u32, &claim_op);
     assert_eq!(ctx.events.get_event(&id).status, EventStatus::Completed);
 
     let again = Address::generate(&ctx.env);

From a413d23488a259d60defae35dd04846cf68d6816 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 19:35:37 +0100
Subject: [PATCH 08/12] perf(grant): O(1) claim_milestone recipient lookup +
 increase get_winners cap

---
 contracts/events/src/event_ops.rs |  7 +++--
 contracts/events/src/grant.rs     | 44 +++++++++++++------------------
 contracts/events/src/storage.rs   | 33 +++++++++++++++++++++++
 contracts/events/src/types.rs     |  6 +++++
 4 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index 7ee2e8a..d7da8cf 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -155,6 +155,7 @@ pub fn create_event(env: &Env, params: CreateEventParams, op_id: BytesN<32>) ->
                 reputation_bump: None,
             },
         );
+        storage::set_grant_recipient_idx(env, id, &params.owner, 0);
     }
 
     evt::EventCreated {
@@ -670,7 +671,8 @@ pub fn select_winners(
             }
         }
         ReleaseKind::Multi(_) => {
-            for spec in winners.iter() {
+            for (i, spec) in winners.iter().enumerate() {
+                let anchor_idx = existing_count + (i as u32);
                 storage::append_winner(
                     env,
                     event_id,
@@ -683,6 +685,7 @@ pub fn select_winners(
                         reputation_bump: Some(spec.reputation_bump),
                     },
                 );
+                storage::set_grant_recipient_idx(env, event_id, &spec.recipient, anchor_idx);
             }
         }
     }
@@ -849,7 +852,7 @@ pub fn get_winners(env: &Env, event_id: u64) -> Result<Vec<Winner>, Error> {
     Ok(storage::winners_snapshot(
         env,
         event_id,
-        MAX_WINNERS_PER_SELECT,
+        MAX_WINNERS_PER_SELECT.saturating_mul(20),
     ))
 }
 
diff --git a/contracts/events/src/grant.rs b/contracts/events/src/grant.rs
index dec0dd7..022318e 100644
--- a/contracts/events/src/grant.rs
+++ b/contracts/events/src/grant.rs
@@ -54,33 +54,24 @@ pub fn claim_milestone(
         return Err(Error::MilestoneAlreadyClaimed);
     }
 
-    let count = storage::winner_count(env, event_id);
-    let mut winner_position: Option<u32> = None;
-    let mut reputation_bump: u32 = 0;
-    let mut already_claimed_for_recipient: u32 = 0;
-    let mut already_paid_to_recipient: i128 = 0;
-    for idx in 0..count {
-        let w = match storage::winner_at(env, event_id, idx) {
-            Some(w) => w,
-            None => continue,
-        };
-        if w.recipient != recipient {
-            continue;
-        }
-        match w.milestone {
-            None => {
-                winner_position = Some(w.position);
-                reputation_bump = w.reputation_bump.unwrap_or(0);
-            }
-            Some(_) => {
-                already_claimed_for_recipient = already_claimed_for_recipient.saturating_add(1);
-                already_paid_to_recipient = already_paid_to_recipient.saturating_add(w.amount);
-            }
-        }
-    }
-    let position = winner_position.ok_or(Error::NoSubmissions)?;
-
     let is_crowdfunding = matches!(event.pillar, Pillar::Crowdfunding);
+
+    let anchor_idx =
+        storage::get_grant_recipient_idx(env, event_id, &recipient).ok_or(Error::NoSubmissions)?;
+    let anchor = storage::winner_at(env, event_id, anchor_idx).ok_or(Error::NoSubmissions)?;
+    let position = anchor.position;
+    let reputation_bump = anchor.reputation_bump.unwrap_or(0);
+    let already_claimed_for_recipient =
+        storage::get_grant_recipient_claim_count(env, event_id, &recipient);
+    let already_paid_to_recipient = if is_crowdfunding {
+        0
+    } else {
+        let percent = event.winner_distribution.get(position).unwrap_or(0) as i128;
+        let total_share = event.total_budget.saturating_mul(percent) / 100_i128;
+        let per_milestone_floored = total_share / (total_milestones as i128);
+        (already_claimed_for_recipient as i128).saturating_mul(per_milestone_floored)
+    };
+
     let amount: i128 = if is_crowdfunding {
         let claimed_count = storage::get_crowdfunding_milestones_claimed(env, event_id);
         let remaining_milestones = total_milestones.saturating_sub(claimed_count);
@@ -124,6 +115,7 @@ pub fn claim_milestone(
     }
     event.remaining_escrow = event.remaining_escrow.saturating_sub(amount);
     storage::mark_milestone_claimed(env, event_id, &recipient, milestone);
+    storage::increment_grant_recipient_claim_count(env, event_id, &recipient);
     if is_crowdfunding {
         let claimed = storage::get_crowdfunding_milestones_claimed(env, event_id);
         storage::set_crowdfunding_milestones_claimed(env, event_id, claimed.saturating_add(1));
diff --git a/contracts/events/src/storage.rs b/contracts/events/src/storage.rs
index 03a19cc..8d05802 100644
--- a/contracts/events/src/storage.rs
+++ b/contracts/events/src/storage.rs
@@ -466,6 +466,39 @@ pub fn get_winner_index(env: &Env, id: u64, recipient: &Address, position: u32)
     idx
 }
 
+pub fn get_grant_recipient_idx(env: &Env, id: u64, recipient: &Address) -> Option<u32> {
+    let key = DataKey::GrantRecipientIdx(id, recipient.clone());
+    let idx: Option<u32> = env.storage().persistent().get(&key);
+    if idx.is_some() {
+        touch_event_persistent(env, &key);
+    }
+    idx
+}
+
+pub fn set_grant_recipient_idx(env: &Env, id: u64, recipient: &Address, idx: u32) {
+    let key = DataKey::GrantRecipientIdx(id, recipient.clone());
+    env.storage().persistent().set(&key, &idx);
+    touch_event_persistent(env, &key);
+}
+
+pub fn get_grant_recipient_claim_count(env: &Env, id: u64, recipient: &Address) -> u32 {
+    let key = DataKey::GrantRecipientClaimCount(id, recipient.clone());
+    let count: Option<u32> = env.storage().persistent().get(&key);
+    if count.is_some() {
+        touch_event_persistent(env, &key);
+    }
+    count.unwrap_or(0)
+}
+
+pub fn increment_grant_recipient_claim_count(env: &Env, id: u64, recipient: &Address) {
+    let key = DataKey::GrantRecipientClaimCount(id, recipient.clone());
+    let count: u32 = env.storage().persistent().get(&key).unwrap_or(0);
+    env.storage()
+        .persistent()
+        .set(&key, &count.saturating_add(1));
+    touch_event_persistent(env, &key);
+}
+
 pub fn winners_snapshot(env: &Env, id: u64, max: u32) -> Vec<Winner> {
     let count = winner_count(env, id);
     let upper = if count < max { count } else { max };
diff --git a/contracts/events/src/types.rs b/contracts/events/src/types.rs
index 76d3b90..8bc4050 100644
--- a/contracts/events/src/types.rs
+++ b/contracts/events/src/types.rs
@@ -202,6 +202,12 @@ pub enum DataKey {
 
     // Winner anchor index for O(1) claim_prize lookup (added 2026-07).
     WinnerIndex(u64, Address, u32),
+
+    // Grant anchor index for O(1) claim_milestone recipient lookup.
+    GrantRecipientIdx(u64, Address),
+
+    // Per-recipient milestone claim counter for claim_milestone.
+    GrantRecipientClaimCount(u64, Address),
 }
 
 // ============================================================

From 6d9e9812a8a150abf0732a8d96a7c9e0132f7ac9 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 19:40:40 +0100
Subject: [PATCH 09/12] fix: decouple profile calls from payout in claim_prize
 and claim_milestone

---
 contracts/events/src/event_ops.rs | 31 ++++++++++++++++---------------
 contracts/events/src/grant.rs     | 28 +++++++++++++++-------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index d7da8cf..f8783eb 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -764,23 +764,10 @@ pub fn claim_prize(
         return Err(Error::InsufficientEscrow);
     }
 
-    // Release token from escrow.
+    // Release token from escrow — critical path, must succeed.
     escrow::release(env, &event.token, &recipient, amount);
     event.remaining_escrow = event.remaining_escrow.saturating_sub(amount);
 
-    // Cross-contract profile mutations. Each call gets a unique child op_id.
-    let profile = profile_client::client(env);
-    let reason_win = Symbol::new(env, "win");
-
-    let bootstrap_op = idempotency::derive_child(env, &op_id, tag::BOOTSTRAP);
-    profile.bootstrap(&recipient, &bootstrap_op);
-
-    let rep_op = idempotency::derive_child(env, &op_id, tag::BUMP_REP);
-    profile.bump_reputation(&recipient, &reputation_bump, &reason_win, &rep_op);
-
-    let earnings_op = idempotency::derive_child(env, &op_id, tag::REGISTER_EARNINGS);
-    profile.register_earnings(&recipient, &event.token, &amount, &earnings_op);
-
     // Mark prize claimed (prevents replay for this recipient + position).
     storage::mark_prize_claimed(env, event_id, &recipient, position);
 
@@ -807,12 +794,26 @@ pub fn claim_prize(
 
     evt::PrizeClaimed {
         event_id,
-        recipient,
+        recipient: recipient.clone(),
         position,
         amount,
     }
     .publish(env);
 
+    // Best-effort profile side effects — payout is already finalised so a
+    // profile-contract failure must not block the claim.
+    let profile = profile_client::client(env);
+    let reason_win = Symbol::new(env, "win");
+
+    let bootstrap_op = idempotency::derive_child(env, &op_id, tag::BOOTSTRAP);
+    let _ = profile.try_bootstrap(&recipient, &bootstrap_op);
+
+    let rep_op = idempotency::derive_child(env, &op_id, tag::BUMP_REP);
+    let _ = profile.try_bump_reputation(&recipient, &reputation_bump, &reason_win, &rep_op);
+
+    let earnings_op = idempotency::derive_child(env, &op_id, tag::REGISTER_EARNINGS);
+    let _ = profile.try_register_earnings(&recipient, &event.token, &amount, &earnings_op);
+
     idempotency::mark_seen(env, &op_id);
     Ok(())
 }
diff --git a/contracts/events/src/grant.rs b/contracts/events/src/grant.rs
index 022318e..60b10fc 100644
--- a/contracts/events/src/grant.rs
+++ b/contracts/events/src/grant.rs
@@ -121,18 +121,6 @@ pub fn claim_milestone(
         storage::set_crowdfunding_milestones_claimed(env, event_id, claimed.saturating_add(1));
     }
 
-    let profile = profile_client::client(env);
-    let reason = Symbol::new(env, "milestone");
-
-    let bootstrap_op = idempotency::derive_child(env, &op_id, tag::BOOTSTRAP);
-    profile.bootstrap(&recipient, &bootstrap_op);
-
-    let rep_op = idempotency::derive_child(env, &op_id, tag::BUMP_REP);
-    profile.bump_reputation(&recipient, &reputation_bump, &reason, &rep_op);
-
-    let earnings_op = idempotency::derive_child(env, &op_id, tag::REGISTER_EARNINGS);
-    profile.register_earnings(&recipient, &event.token, &amount, &earnings_op);
-
     storage::append_winner(
         env,
         event_id,
@@ -153,12 +141,26 @@ pub fn claim_milestone(
 
     evt::MilestoneClaimed {
         event_id,
-        recipient,
+        recipient: recipient.clone(),
         milestone,
         amount,
     }
     .publish(env);
 
+    // Best-effort profile side effects — payout is already finalised so a
+    // profile-contract failure must not block the claim.
+    let profile = profile_client::client(env);
+    let reason = Symbol::new(env, "milestone");
+
+    let bootstrap_op = idempotency::derive_child(env, &op_id, tag::BOOTSTRAP);
+    let _ = profile.try_bootstrap(&recipient, &bootstrap_op);
+
+    let rep_op = idempotency::derive_child(env, &op_id, tag::BUMP_REP);
+    let _ = profile.try_bump_reputation(&recipient, &reputation_bump, &reason, &rep_op);
+
+    let earnings_op = idempotency::derive_child(env, &op_id, tag::REGISTER_EARNINGS);
+    let _ = profile.try_register_earnings(&recipient, &event.token, &amount, &earnings_op);
+
     idempotency::mark_seen(env, &op_id);
     Ok(())
 }

From ce7bb7292d5d8a6222a8920977d84d394c8facd1 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 19:44:33 +0100
Subject: [PATCH 10/12] fix: validate anchor.recipient == recipient in
 claim_milestone

---
 contracts/events/src/grant.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contracts/events/src/grant.rs b/contracts/events/src/grant.rs
index 60b10fc..b8efba4 100644
--- a/contracts/events/src/grant.rs
+++ b/contracts/events/src/grant.rs
@@ -59,6 +59,9 @@ pub fn claim_milestone(
     let anchor_idx =
         storage::get_grant_recipient_idx(env, event_id, &recipient).ok_or(Error::NoSubmissions)?;
     let anchor = storage::winner_at(env, event_id, anchor_idx).ok_or(Error::NoSubmissions)?;
+    if anchor.recipient != recipient || anchor.milestone.is_some() {
+        return Err(Error::NoSubmissions);
+    }
     let position = anchor.position;
     let reputation_bump = anchor.reputation_bump.unwrap_or(0);
     let already_claimed_for_recipient =

From 3d7f5100c7f9f3d259194dfd9f5823e9458318a8 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 19:49:18 +0100
Subject: [PATCH 11/12] fix: backward-compatible claim_milestone for
 pre-upgrade events

---
 contracts/events/src/grant.rs   | 71 ++++++++++++++++++++++++++++-----
 contracts/events/src/storage.rs |  6 +++
 2 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/contracts/events/src/grant.rs b/contracts/events/src/grant.rs
index b8efba4..7caed92 100644
--- a/contracts/events/src/grant.rs
+++ b/contracts/events/src/grant.rs
@@ -56,16 +56,8 @@ pub fn claim_milestone(
 
     let is_crowdfunding = matches!(event.pillar, Pillar::Crowdfunding);
 
-    let anchor_idx =
-        storage::get_grant_recipient_idx(env, event_id, &recipient).ok_or(Error::NoSubmissions)?;
-    let anchor = storage::winner_at(env, event_id, anchor_idx).ok_or(Error::NoSubmissions)?;
-    if anchor.recipient != recipient || anchor.milestone.is_some() {
-        return Err(Error::NoSubmissions);
-    }
-    let position = anchor.position;
-    let reputation_bump = anchor.reputation_bump.unwrap_or(0);
-    let already_claimed_for_recipient =
-        storage::get_grant_recipient_claim_count(env, event_id, &recipient);
+    let (position, reputation_bump, already_claimed_for_recipient) =
+        resolve_recipient(env, event_id, &recipient)?;
     let already_paid_to_recipient = if is_crowdfunding {
         0
     } else {
@@ -167,3 +159,62 @@ pub fn claim_milestone(
     idempotency::mark_seen(env, &op_id);
     Ok(())
 }
+
+/// Resolve recipient anchor (position + reputation_bump) and milestone claim count.
+///
+/// Tries the O(1) index path first. If the indexes don't exist (pre-upgrade events),
+/// falls back to a linear scan over winner rows and persists the indexes so future
+/// calls use the fast path.
+fn resolve_recipient(
+    env: &Env,
+    event_id: u64,
+    recipient: &Address,
+) -> Result<(u32, u32, u32), Error> {
+    // Fast path: indexes already exist (post-upgrade events).
+    if let Some(anchor_idx) = storage::get_grant_recipient_idx(env, event_id, recipient) {
+        let anchor = storage::winner_at(env, event_id, anchor_idx).ok_or(Error::NoSubmissions)?;
+        if anchor.recipient != *recipient || anchor.milestone.is_some() {
+            return Err(Error::NoSubmissions);
+        }
+        let claim_count = storage::get_grant_recipient_claim_count(env, event_id, recipient);
+        return Ok((
+            anchor.position,
+            anchor.reputation_bump.unwrap_or(0),
+            claim_count,
+        ));
+    }
+
+    // Legacy fallback: scan winner rows, which works before the indexes existed.
+    let count = storage::winner_count(env, event_id);
+    let mut anchor_idx = None;
+    let mut position = None;
+    let mut reputation_bump = 0;
+    let mut claim_count = 0u32;
+    for idx in 0..count {
+        let w = match storage::winner_at(env, event_id, idx) {
+            Some(w) => w,
+            None => continue,
+        };
+        if w.recipient != *recipient {
+            continue;
+        }
+        match w.milestone {
+            None => {
+                anchor_idx = Some(idx);
+                position = Some(w.position);
+                reputation_bump = w.reputation_bump.unwrap_or(0);
+            }
+            Some(_) => {
+                claim_count = claim_count.saturating_add(1);
+            }
+        }
+    }
+    let idx = anchor_idx.ok_or(Error::NoSubmissions)?;
+    let pos = position.ok_or(Error::NoSubmissions)?;
+
+    // Persist indexes for future O(1) lookups.
+    storage::set_grant_recipient_idx(env, event_id, recipient, idx);
+    storage::set_grant_recipient_claim_count(env, event_id, recipient, claim_count);
+
+    Ok((pos, reputation_bump, claim_count))
+}
diff --git a/contracts/events/src/storage.rs b/contracts/events/src/storage.rs
index 8d05802..4edeba2 100644
--- a/contracts/events/src/storage.rs
+++ b/contracts/events/src/storage.rs
@@ -490,6 +490,12 @@ pub fn get_grant_recipient_claim_count(env: &Env, id: u64, recipient: &Address)
     count.unwrap_or(0)
 }
 
+pub fn set_grant_recipient_claim_count(env: &Env, id: u64, recipient: &Address, count: u32) {
+    let key = DataKey::GrantRecipientClaimCount(id, recipient.clone());
+    env.storage().persistent().set(&key, &count);
+    touch_event_persistent(env, &key);
+}
+
 pub fn increment_grant_recipient_claim_count(env: &Env, id: u64, recipient: &Address) {
     let key = DataKey::GrantRecipientClaimCount(id, recipient.clone());
     let count: u32 = env.storage().persistent().get(&key).unwrap_or(0);

From 44d5d8bc93cd8dc214a629f659ac2e079d66e5b4 Mon Sep 17 00:00:00 2001
From: Shadow-MMN <nnajimakuochukwu4@gmail.com>
Date: Sat, 18 Jul 2026 19:54:28 +0100
Subject: [PATCH 12/12] refactor: remove redundant PrizeClaimed storage flag,
 use paid_at as sole guard

---
 contracts/events/src/event_ops.rs |  8 --------
 contracts/events/src/storage.rs   | 21 ---------------------
 contracts/events/src/types.rs     |  3 ---
 3 files changed, 32 deletions(-)

diff --git a/contracts/events/src/event_ops.rs b/contracts/events/src/event_ops.rs
index f8783eb..9ecc989 100644
--- a/contracts/events/src/event_ops.rs
+++ b/contracts/events/src/event_ops.rs
@@ -737,11 +737,6 @@ pub fn claim_prize(
 
     recipient.require_auth();
 
-    // Prevent double-claim for this (event, recipient, position).
-    if storage::is_prize_claimed(env, event_id, &recipient, position) {
-        return Err(Error::PrizeAlreadyClaimed);
-    }
-
     // Look up the anchor index stored at selection time (O(1) instead of
     // a linear scan). Returns NoSubmissions if no winner matches or the
     // prize has already been claimed (canonical guard: paid_at).
@@ -768,9 +763,6 @@ pub fn claim_prize(
     escrow::release(env, &event.token, &recipient, amount);
     event.remaining_escrow = event.remaining_escrow.saturating_sub(amount);
 
-    // Mark prize claimed (prevents replay for this recipient + position).
-    storage::mark_prize_claimed(env, event_id, &recipient, position);
-
     // Update the anchor row in-place with the paid timestamp instead of
     // appending a duplicate row. This keeps winner_count == selected count.
     storage::set_winner_at(
diff --git a/contracts/events/src/storage.rs b/contracts/events/src/storage.rs
index 4edeba2..41770bc 100644
--- a/contracts/events/src/storage.rs
+++ b/contracts/events/src/storage.rs
@@ -648,27 +648,6 @@ pub fn set_crowdfunding_milestones_claimed(env: &Env, id: u64, count: u32) {
     touch_event_persistent(env, &key);
 }
 
-// ============================================================
-// PRIZE CLAIMS (persistent; per-(event, recipient, position))
-//
-// Tracks which winners have claimed their prize in the pull-model flow for
-// Single-release events (bounties, hackathons). Written by claim_prize.
-// ============================================================
-pub fn is_prize_claimed(env: &Env, id: u64, recipient: &Address, position: u32) -> bool {
-    let key = DataKey::PrizeClaimed(id, recipient.clone(), position);
-    let claimed: Option<bool> = env.storage().persistent().get(&key);
-    if claimed.is_some() {
-        touch_event_persistent(env, &key);
-    }
-    claimed.unwrap_or(false)
-}
-
-pub fn mark_prize_claimed(env: &Env, id: u64, recipient: &Address, position: u32) {
-    let key = DataKey::PrizeClaimed(id, recipient.clone(), position);
-    env.storage().persistent().set(&key, &true);
-    touch_event_persistent(env, &key);
-}
-
 // ============================================================
 // CANCELLATION STATE (persistent; present only while Cancelling)
 // ============================================================
diff --git a/contracts/events/src/types.rs b/contracts/events/src/types.rs
index 8bc4050..33215bc 100644
--- a/contracts/events/src/types.rs
+++ b/contracts/events/src/types.rs
@@ -197,9 +197,6 @@ pub enum DataKey {
     // Appended in 1.2.0 to preserve existing key discriminants.
     NonOwnerContributionTotal(u64),
 
-    // Added last so earlier variant discriminants remain stable on upgrade.
-    PrizeClaimed(u64, Address, u32),
-
     // Winner anchor index for O(1) claim_prize lookup (added 2026-07).
     WinnerIndex(u64, Address, u32),