Skip to content

refactor: group UTxO and address deltas by tx #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 14, 2025
Merged

refactor: group UTxO and address deltas by tx #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06bb40c
feat: account tx count indexing (WIP)
whankinsiv Nov 12, 2025
0c70a3e
refactor: group UTxO, address, and stake deltas by transaction
whankinsiv Nov 12, 2025
3075dcd
fix: deduplicate tx count for stake deltas
whankinsiv Nov 12, 2025
927ea2b
fix: cleanup
whankinsiv Nov 13, 2025
cb7c5a4
merge upstream/main
whankinsiv Nov 13, 2025
df09d6f
fix: use Value instead of ValueDelta for AddressDelta and TxTotals
whankinsiv Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/src/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub struct GenesisUTxOsMessage {
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
pub struct UTXODeltasMessage {
/// Ordered set of deltas
pub deltas: Vec<UTXODelta>,
pub deltas: Vec<TxUTxODeltas>,
}

/// Message encapsulating multiple asset deltas
Expand Down
2 changes: 2 additions & 0 deletions common/src/queries/accounts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ pub enum AccountsStateQuery {
GetAccountMIRHistory { account: StakeAddress },
GetAccountWithdrawalHistory { account: StakeAddress },
GetAccountAssociatedAddresses { account: StakeAddress },
GetAccountTotalTxCount { account: StakeAddress },

// Epochs-related queries
GetActiveStakes {},
Expand Down Expand Up @@ -62,6 +63,7 @@ pub enum AccountsStateQueryResponse {
AccountMIRHistory(Vec<AccountWithdrawal>),
AccountWithdrawalHistory(Vec<AccountWithdrawal>),
AccountAssociatedAddresses(Vec<ShelleyAddress>),
AccountTotalTxCount(u32),

// Epochs-related responses
ActiveStakes(u64),
Expand Down
37 changes: 37 additions & 0 deletions common/src/stake_addresses.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 100,
});

Expand Down Expand Up @@ -682,6 +683,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 100,
});

Expand Down Expand Up @@ -741,6 +743,7 @@ mod tests {
let delta = StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 42,
};
stake_addresses.process_stake_delta(&delta);
Expand All @@ -760,12 +763,14 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 100,
});

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: -30,
});

Expand All @@ -782,13 +787,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 50,
});

// Try to subtract more than available
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: -100,
});

Expand All @@ -810,6 +817,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: stake_address.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 42,
});
assert_eq!(stake_addresses.get(&stake_address).unwrap().utxo_value, 42);
Expand Down Expand Up @@ -1021,13 +1029,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 50);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});
stake_addresses.add_to_reward(&addr2, 100);
Expand Down Expand Up @@ -1055,11 +1065,13 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand All @@ -1079,6 +1091,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});

Expand All @@ -1105,20 +1118,23 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 50);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});
stake_addresses.add_to_reward(&addr2, 100);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr3.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 3000,
});
stake_addresses.add_to_reward(&addr3, 150);
Expand Down Expand Up @@ -1159,13 +1175,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 50);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});
stake_addresses.add_to_reward(&addr2, 100);
Expand All @@ -1192,11 +1210,13 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand All @@ -1221,13 +1241,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 50);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand Down Expand Up @@ -1255,13 +1277,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 500);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand All @@ -1283,6 +1307,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});

Expand Down Expand Up @@ -1314,13 +1339,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 500);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand All @@ -1340,6 +1367,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});

Expand Down Expand Up @@ -1375,13 +1403,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 100);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand All @@ -1403,6 +1433,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});

Expand Down Expand Up @@ -1434,13 +1465,15 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.add_to_reward(&addr1, 100);

stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});

Expand All @@ -1460,6 +1493,7 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});

Expand Down Expand Up @@ -1550,16 +1584,19 @@ mod tests {
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr1.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 1000,
});
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr2.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 2000,
});
stake_addresses.process_stake_delta(&StakeAddressDelta {
stake_address: addr3.clone(),
addresses: Vec::new(),
tx_count: 1,
delta: 3000,
});

Expand Down
Loading