1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177
use super::{
ByteReader, ByteWriter, Deserializable, DeserializationError, Felt, Serializable, Word, ZERO,
};
use crate::{assets::Asset, utils::string::*, AccountDeltaError};
mod storage;
pub use storage::AccountStorageDelta;
mod vault;
pub use vault::AccountVaultDelta;
// ACCOUNT DELTA
// ================================================================================================
/// [AccountDelta] stores the differences between two account states.
///
/// The differences are represented as follows:
/// - storage: an [AccountStorageDelta] that contains the changes to the account storage.
/// - vault: an [AccountVaultDelta] object that contains the changes to the account vault.
/// - nonce: if the nonce of the account has changed, the new nonce is stored here.
///
/// TODO: add ability to trace account code updates.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub struct AccountDelta {
storage: AccountStorageDelta,
vault: AccountVaultDelta,
nonce: Option<Felt>,
}
impl AccountDelta {
// CONSTRUCTOR
// --------------------------------------------------------------------------------------------
/// Returns new [AccountDelta] instantiated from the provided components.
///
/// # Errors
/// Returns an error if:
/// - Storage or vault deltas are invalid.
/// - Storage and vault deltas are empty, and the nonce was updated.
/// - Storage or vault deltas are not empty, but nonce was not updated.
pub fn new(
storage: AccountStorageDelta,
vault: AccountVaultDelta,
nonce: Option<Felt>,
) -> Result<Self, AccountDeltaError> {
// make sure storage and vault deltas are valid
storage.validate()?;
vault.validate()?;
// nonce must be updated if and only if either account storage or vault were updated
validate_nonce(nonce, &storage, &vault)?;
Ok(Self { storage, vault, nonce })
}
// PUBLIC ACCESSORS
// --------------------------------------------------------------------------------------------
/// Returns true if this account delta does not contain any updates.
pub fn is_empty(&self) -> bool {
self.storage.is_empty() && self.vault.is_empty()
}
/// Returns storage updates for this account delta.
pub fn storage(&self) -> &AccountStorageDelta {
&self.storage
}
/// Returns vault updates for this account delta.
pub fn vault(&self) -> &AccountVaultDelta {
&self.vault
}
/// Returns the new nonce, if the nonce was changes.
pub fn nonce(&self) -> Option<Felt> {
self.nonce
}
/// Converts this storage delta into individual delta components.
pub fn into_parts(self) -> (AccountStorageDelta, AccountVaultDelta, Option<Felt>) {
(self.storage, self.vault, self.nonce)
}
}
impl Serializable for AccountDelta {
fn write_into<W: ByteWriter>(&self, target: &mut W) {
self.storage.write_into(target);
self.vault.write_into(target);
self.nonce.write_into(target);
}
}
impl Deserializable for AccountDelta {
fn read_from<R: ByteReader>(source: &mut R) -> Result<Self, DeserializationError> {
let storage = AccountStorageDelta::read_from(source)?;
let vault = AccountVaultDelta::read_from(source)?;
let nonce = <Option<Felt>>::read_from(source)?;
validate_nonce(nonce, &storage, &vault)
.map_err(|err| DeserializationError::InvalidValue(err.to_string()))?;
Ok(Self { storage, vault, nonce })
}
}
// HELPER FUNCTIONS
// ================================================================================================
/// Checks if the nonce was updated correctly given the provided storage and vault deltas.
///
/// # Errors
/// Returns an error if:
/// - Storage or vault were updated, but the nonce was either not updated or set to 0.
/// - Storage and vault were not updated, but the nonce was updated.
fn validate_nonce(
nonce: Option<Felt>,
storage: &AccountStorageDelta,
vault: &AccountVaultDelta,
) -> Result<(), AccountDeltaError> {
if !storage.is_empty() || !vault.is_empty() {
match nonce {
Some(nonce) => {
if nonce == ZERO {
return Err(AccountDeltaError::InconsistentNonceUpdate(
"zero nonce for a non-empty account delta".to_string(),
));
}
},
None => {
return Err(AccountDeltaError::InconsistentNonceUpdate(
"nonce not updated for non-empty account delta".to_string(),
))
},
}
} else if nonce.is_some() {
return Err(AccountDeltaError::InconsistentNonceUpdate(
"nonce updated for empty delta".to_string(),
));
}
Ok(())
}
// TESTS
// ================================================================================================
#[cfg(test)]
mod tests {
use super::{AccountDelta, AccountStorageDelta, AccountVaultDelta};
use crate::{ONE, ZERO};
#[test]
fn account_delta_nonce_validation() {
// empty delta
let storage_delta = AccountStorageDelta {
cleared_items: vec![],
updated_items: vec![],
};
let vault_delta = AccountVaultDelta {
added_assets: vec![],
removed_assets: vec![],
};
assert!(AccountDelta::new(storage_delta.clone(), vault_delta.clone(), None).is_ok());
assert!(AccountDelta::new(storage_delta.clone(), vault_delta.clone(), Some(ONE)).is_err());
// non-empty delta
let storage_delta = AccountStorageDelta {
cleared_items: vec![1],
updated_items: vec![],
};
assert!(AccountDelta::new(storage_delta.clone(), vault_delta.clone(), None).is_err());
assert!(AccountDelta::new(storage_delta.clone(), vault_delta.clone(), Some(ZERO)).is_err());
assert!(AccountDelta::new(storage_delta.clone(), vault_delta.clone(), Some(ONE)).is_ok());
}
}