Skip to content
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

Extract object loading from transaction input checking #14579

Merged
merged 14 commits into from
Nov 8, 2023
Merged

Extract object loading from transaction input checking #14579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b82ef14
Extract object loading from transaction input checking. This:
mystenmark Oct 20, 2023
ac0d2b0
add missing continue
mystenmark Nov 1, 2023
87866c1
Fix comment
mystenmark Nov 2, 2023
1e9093e
wip
mystenmark Nov 2, 2023
2f4ceab
PR comments
mystenmark Nov 2, 2023
9a78977
Update crates/sui-core/src/authority.rs
mystenmark Nov 2, 2023
8bcfd04
PR comments
mystenmark Nov 2, 2023
edd8a01
PR comments
mystenmark Nov 2, 2023
8ef9321
PR comments
mystenmark Nov 2, 2023
fe32f27
fix
mystenmark Nov 2, 2023
aeb8ce9
PR feedback
mystenmark Nov 7, 2023
e64b86b
Handle case where gas is a deleted shared object
mystenmark Nov 7, 2023
4973a12
rebase
mystenmark Nov 8, 2023
217e8cd
Read receiving objects for dry run
mystenmark Nov 8, 2023
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
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@mystenmark
mystenmark committed Nov 8, 2023
commit aeb8ce90fa0e9ee9c26b6ad90852ea1e77357d60
61 changes: 28 additions & 33 deletions crates/sui-core/src/transaction_input_loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,52 +54,45 @@ impl TransactionInputLoader {
.into()
);

let mut results = vec![None; input_object_kinds.len()];
let mut input_results = vec![None; input_object_kinds.len()];
let mut object_keys = Vec::with_capacity(input_object_kinds.len());
let mut fetch_indices = Vec::with_capacity(input_object_kinds.len());

for (i, kind) in input_object_kinds.iter().enumerate() {
let obj_ref = match kind {
match kind {
// Packages are loaded one at a time via the cache
InputObjectKind::MovePackage(id) => {
let Some(package) = self.store.get_package_object(id)?.map(|o| o.into()) else {
return Err(SuiError::from(kind.object_not_found_error()));
};
results[i] = Some(ObjectReadResult {
input_results[i] = Some(ObjectReadResult {
input_object_kind: *kind,
object: ObjectReadResultKind::Object(package),
});
continue;
}
InputObjectKind::SharedMoveObject { id, .. } => {
match self.store.get_object(id)? {
Some(object) => {
results[i] = Some(ObjectReadResult::new(*kind, object.into()))
}
None => {
if let Some((version, digest)) = self
.store
.get_last_shared_object_deletion_info(id, epoch_id)?
{
results[i] = Some(ObjectReadResult {
input_object_kind: *kind,
object: ObjectReadResultKind::DeletedSharedObject(
version, digest,
),
});
} else {
return Err(SuiError::from(kind.object_not_found_error()));
}
InputObjectKind::SharedMoveObject { id, .. } => match self.store.get_object(id)? {
Some(object) => {
input_results[i] = Some(ObjectReadResult::new(*kind, object.into()))
}
None => {
if let Some((version, digest)) = self
.store
.get_last_shared_object_deletion_info(id, epoch_id)?
{
input_results[i] = Some(ObjectReadResult {
input_object_kind: *kind,
object: ObjectReadResultKind::DeletedSharedObject(version, digest),
});
} else {
return Err(SuiError::from(kind.object_not_found_error()));
}
}
continue;
},
InputObjectKind::ImmOrOwnedMoveObject(objref) => {
object_keys.push(ObjectKey::from(objref));
fetch_indices.push(i);
}
InputObjectKind::ImmOrOwnedMoveObject(objref) => Some(*objref),
}
.ok_or_else(|| SuiError::from(kind.object_not_found_error()))?;

object_keys.push(ObjectKey::from(obj_ref));
fetch_indices.push(i);
}

let objects = self.store.multi_get_object_by_key(&object_keys)?;
Expand All @@ -108,7 +101,7 @@ impl TransactionInputLoader {
SuiError::from(input_object_kinds[index].object_not_found_error())
})?;

results[index] = Some(ObjectReadResult {
input_results[index] = Some(ObjectReadResult {
input_object_kind: input_object_kinds[index],
object: ObjectReadResultKind::Object(Arc::new(object)),
});
Expand Down Expand Up @@ -143,7 +136,7 @@ impl TransactionInputLoader {
}

Ok((
results
input_results
.into_iter()
.map(Option::unwrap)
.collect::<Vec<_>>()
Expand Down Expand Up @@ -218,11 +211,13 @@ impl TransactionInputLoader {
/// All the owned input objects will likely have been loaded during transaction signing, and
/// can be stored as a group with the transaction_digest as the key, allowing the lookup to
/// proceed with only a single hash map lookup. (additional lookups may be necessary for shared
mystenmark marked this conversation as resolved.
Show resolved Hide resolved
/// inputs, since the versions are not known at signing time).
/// inputs, since the versions are not known at signing time). Receiving objects could be
/// cached, but only with appropriate invalidation logic for when an object is received by a
/// different tx first.
#[instrument(level = "trace", skip_all)]
pub async fn read_objects_for_execution(
&self,
shared_lock_store: &dyn GetSharedLocks,
shared_lock_store: &impl GetSharedLocks,
tx_digest: &TransactionDigest,
input_object_kinds: &[InputObjectKind],
epoch_id: EpochId,
Expand Down
1 change: 0 additions & 1 deletion crates/sui-transaction-checks/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ mod checked {
input_object_kind.is_mutable(),
*digest,
));
continue;
}
}
}
Expand Down