Skip to content

Ab/shield from shard vault #1497

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
brenzi merged 4 commits into from
Nov 20, 2023
Merged

Ab/shield from shard vault #1497

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c1b047
now shielding from vault instead of alice. breaks sidechain block pro…
brenzi Nov 17, 2023
cb9b5ae
fix
brenzi Nov 17, 2023
01a19d1
fix unit testing
brenzi Nov 17, 2023
61dccee
fix clippy
brenzi Nov 17, 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
fix
  • Loading branch information
@brenzi
brenzi committed Nov 17, 2023
commit cb9b5aef80916d9bd12ddf74c77400a41c3b1da4
7 changes: 1 addition & 6 deletions app-libs/parentchain-interface/src/integritee/event_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,7 @@ impl FilterEvents for FilterableEvents {
.iter()
.flatten() // flatten filters out the nones
.filter_map(|ev| match ev.as_event::<BalanceTransfer>() {
Ok(maybe_event) => {
if maybe_event.is_none() {
log::warn!("Transfer event does not exist in parentchain metadata");
};
maybe_event
},
Ok(maybe_event) => maybe_event,
Err(e) => {
log::error!("Could not decode event: {:?}", e);
None
Expand Down
2 changes: 1 addition & 1 deletion app-libs/parentchain-interface/src/integritee/event_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ where
.iter()
.filter(|&event| event.to == *vault_account)
.try_for_each(|event| {
info!("transfer_event: {}", event);
info!("found transfer_event to vault account: {}", event);
//call = IndirectCall::ShieldFunds(ShieldFundsArgs{ })
Self::shield_funds(executor, &event.from, event.amount)
})
Expand Down
2 changes: 1 addition & 1 deletion core/parentchain/block-importer/src/block_importer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl<
Ok(executed_shielding_calls) => {
calls.push(executed_shielding_calls);
},
Err(_) => error!("[{:?}] Error executing relevant extrinsics", id),
Err(e) => error!("[{:?}] Error executing relevant extrinsics: {:?}", id, e),
};

info!(
Expand Down
5 changes: 3 additions & 2 deletions core/parentchain/indirect-calls-executor/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,9 @@ impl<
trace!("xt_statuses:: {:?}", xt_statuses);

let shard = self.get_default_shard();
let vault = self.stf_enclave_signer.get_shard_vault(&shard)?;
ParentchainEventHandler::handle_events(self, events, &vault)?;
if let Ok(vault) = self.stf_enclave_signer.get_shard_vault(&shard) {
Copy link
Contributor

@clangenb clangenb Nov 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we decide not to handle any events at all if the vault key is not present?

Copy link
Collaborator Author

@brenzi brenzi Nov 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at the moment. we'd need to become more generic yet if we want to support other cases

ParentchainEventHandler::handle_events(self, events, &vault)?;
}

// This would be catastrophic but should never happen
if xt_statuses.len() != block.extrinsics().len() {
Expand Down