Merge pull request #358 from input-output-hk/whankinsiv/account-tx-count

refactor: group UTxO and address deltas by tx

Author: whankinsiv

common/src/messages.rs

@@ -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

common/src/queries/accounts.rs

@@ -29,6 +29,7 @@ pub enum AccountsStateQuery {
     GetAccountMIRHistory { account: StakeAddress },
     GetAccountWithdrawalHistory { account: StakeAddress },
     GetAccountAssociatedAddresses { account: StakeAddress },
+    GetAccountTotalTxCount { account: StakeAddress },
 
     // Epochs-related queries
     GetActiveStakes {},
@@ -62,6 +63,7 @@ pub enum AccountsStateQueryResponse {
     AccountMIRHistory(Vec<AccountWithdrawal>),
     AccountWithdrawalHistory(Vec<AccountWithdrawal>),
     AccountAssociatedAddresses(Vec<ShelleyAddress>),
+    AccountTotalTxCount(u32),
 
     // Epochs-related responses
     ActiveStakes(u64),

common/src/stake_addresses.rs

@@ -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,
             });
 
@@ -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,
             });
 
@@ -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);
@@ -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,
             });
 
@@ -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,
             });
 
@@ -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);
@@ -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);
@@ -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,
             });
 
@@ -1079,6 +1091,7 @@ mod tests {
             stake_addresses.process_stake_delta(&StakeAddressDelta {
                 stake_address: addr1.clone(),
                 addresses: Vec::new(),
+                tx_count: 1,
                 delta: 1000,
             });
 
@@ -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);
@@ -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);
@@ -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,
             });
 
@@ -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,
             });
 
@@ -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,
             });
 
@@ -1283,6 +1307,7 @@ mod tests {
             stake_addresses.process_stake_delta(&StakeAddressDelta {
                 stake_address: addr1.clone(),
                 addresses: Vec::new(),
+                tx_count: 1,
                 delta: 1000,
             });
 
@@ -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,
             });
 
@@ -1340,6 +1367,7 @@ mod tests {
             stake_addresses.process_stake_delta(&StakeAddressDelta {
                 stake_address: addr1.clone(),
                 addresses: Vec::new(),
+                tx_count: 1,
                 delta: 1000,
             });
 
@@ -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,
             });
 
@@ -1403,6 +1433,7 @@ mod tests {
             stake_addresses.process_stake_delta(&StakeAddressDelta {
                 stake_address: addr1.clone(),
                 addresses: Vec::new(),
+                tx_count: 1,
                 delta: 1000,
             });
 
@@ -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,
             });
 
@@ -1460,6 +1493,7 @@ mod tests {
             stake_addresses.process_stake_delta(&StakeAddressDelta {
                 stake_address: addr1.clone(),
                 addresses: Vec::new(),
+                tx_count: 1,
                 delta: 1000,
             });
 
@@ -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,
             });