Skip to content

skip indirect invocations for initial sync of integritee parentchain #1517

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 18 commits into from
Dec 8, 2023
Merged

skip indirect invocations for initial sync of integritee parentchain #1517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
23a6e36
ensure extrinsic success for enclave RA registration and fix #1515
brenzi Dec 4, 2023
a0e64e2
postpone provisioning to after registering own enclave onchain
brenzi Dec 4, 2023
22357f2
remove request-state argument form run config. no longer necessary to…
brenzi Dec 4, 2023
73086ea
introduce shard birth concept and a bit of renaming throughout
brenzi Dec 7, 2023
61cb3d5
fixing startup panic. fast-sync disabled now
brenzi Dec 7, 2023
e8318e6
fast-syncing integritee parentchain now
brenzi Dec 7, 2023
e010a7d
cargo fix
brenzi Dec 7, 2023
6aba175
clippy
brenzi Dec 7, 2023
27be629
fast-sync now also skips event and proof fetching from rpc
brenzi Dec 7, 2023
290a372
Merge branch 'master' into ab/skip-indirect-invocation-for-initial-sync
brenzi Dec 7, 2023
fd6915a
clippy
brenzi Dec 7, 2023
2e9291e
OCW now provisions entire state as well
brenzi Dec 8, 2023
de88cc5
fix enclave tests
brenzi Dec 8, 2023
0f1f85e
fetch peer for provisioning based on their activity and avoid fetchin…
brenzi Dec 8, 2023
e536ede
tiny clone remove
brenzi Dec 8, 2023
90af086
rename birth > creation
brenzi Dec 8, 2023
35c5eae
bump v0.12.2
brenzi Dec 8, 2023
61b5134
rename is_syncing > immediate_import
brenzi Dec 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
Next Next commit
ensure extrinsic success for enclave RA registration and fix #1515
  • Loading branch information
@brenzi
brenzi committed Dec 4, 2023
commit 23a6e36b9649c1f022284bbd4b60bc9c0c9dd564
25 changes: 20 additions & 5 deletions core-primitives/enclave-api/src/remote_attestation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ mod impl_ffi {

ensure!(result == sgx_status_t::SGX_SUCCESS, Error::Sgx(result));
ensure!(retval == sgx_status_t::SGX_SUCCESS, Error::Sgx(retval));

ensure!(
(unchecked_extrinsic_size as usize) < unchecked_extrinsic.len(),
Error::Sgx(sgx_status_t::SGX_ERROR_INVALID_PARAMETER)
);
Ok(Vec::from(&unchecked_extrinsic[..unchecked_extrinsic_size as usize]))
}
fn generate_dcap_ra_extrinsic_from_quote(
Expand Down Expand Up @@ -194,7 +197,10 @@ mod impl_ffi {

ensure!(result == sgx_status_t::SGX_SUCCESS, Error::Sgx(result));
ensure!(retval == sgx_status_t::SGX_SUCCESS, Error::Sgx(retval));

ensure!(
(unchecked_extrinsic_size as usize) < unchecked_extrinsic.len(),
Error::Sgx(sgx_status_t::SGX_ERROR_INVALID_PARAMETER)
);
Ok(Vec::from(&unchecked_extrinsic[..unchecked_extrinsic_size as usize]))
}

Expand Down Expand Up @@ -274,7 +280,10 @@ mod impl_ffi {

ensure!(result == sgx_status_t::SGX_SUCCESS, Error::Sgx(result));
ensure!(retval == sgx_status_t::SGX_SUCCESS, Error::Sgx(retval));

ensure!(
(unchecked_extrinsic_size as usize) < unchecked_extrinsic.len(),
Error::Sgx(sgx_status_t::SGX_ERROR_INVALID_PARAMETER)
);
Ok(Vec::from(&unchecked_extrinsic[..unchecked_extrinsic_size as usize]))
}

Expand Down Expand Up @@ -307,7 +316,10 @@ mod impl_ffi {
free_status == sgx_quote3_error_t::SGX_QL_SUCCESS,
Error::SgxQuote(free_status)
);

ensure!(
(unchecked_extrinsic_size as usize) < unchecked_extrinsic.len(),
Error::Sgx(sgx_status_t::SGX_ERROR_INVALID_PARAMETER)
);
Ok(Vec::from(&unchecked_extrinsic[..unchecked_extrinsic_size as usize]))
}

Expand Down Expand Up @@ -337,7 +349,10 @@ mod impl_ffi {
free_status == sgx_quote3_error_t::SGX_QL_SUCCESS,
Error::SgxQuote(free_status)
);

ensure!(
(unchecked_extrinsic_size as usize) < unchecked_extrinsic.len(),
Error::Sgx(sgx_status_t::SGX_ERROR_INVALID_PARAMETER)
);
Ok(Vec::from(&unchecked_extrinsic[..unchecked_extrinsic_size as usize]))
}

Expand Down
17 changes: 8 additions & 9 deletions service/src/main_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,11 +478,13 @@ fn start_worker<E, T, D, InitializationHandler, WorkerModeProvider>(
send_extrinsic(register_xt(), &node_api2, &tee_accountid_clone, is_development_mode)
};

// Todo: Can't unwrap here because the extrinsic is for some reason not found in the block
// even if it was successful: https://github.com/scs/substrate-api-client/issues/624.
let register_enclave_block_hash = send_register_xt();
let api_register_enclave_xt_header =
integritee_rpc_api.get_header(register_enclave_block_hash).unwrap().unwrap();
let register_enclave_block_hash =
send_register_xt().expect("enclave RA registration must be successful to continue");

let api_register_enclave_xt_header = integritee_rpc_api
.get_header(Some(register_enclave_block_hash))
.unwrap()
.unwrap();

// TODO: #1451: Fix api-client type hacks
let register_enclave_xt_header =
Expand Down Expand Up @@ -868,8 +870,6 @@ fn send_extrinsic(
hex::encode(extrinsic.clone())
);

// fixme: wait ...until_success doesn't work due to https://github.com/scs/substrate-api-client/issues/624
// fixme: currently, we don't verify if the extrinsic was a success here
match api.submit_and_watch_opaque_extrinsic_until(&extrinsic.into(), XtStatus::Finalized) {
Ok(xt_report) => {
info!(
Expand All @@ -879,8 +879,7 @@ fn send_extrinsic(
xt_report.block_hash
},
Err(e) => {
error!("ExtrinsicFailed {:?}", e);
None
panic!("Extrinsic failed {:?} parentchain genesis: {:?}", e, api.genesis_hash());
},
}
}
Expand Down