From 4c97ebb49da59f49618761a9ea51b343db8a9b8e Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Tue, 10 Dec 2024 09:58:40 -0500 Subject: [PATCH] chore: more clarification in docs, add to gitignore --- .gitignore | 12 +++++++ .../src/executor/event_handler.rs | 31 +++++++++---------- .../contracts/lib/forge-std | 2 +- .../contracts/lib/core | 2 +- .../contracts/lib/forge-std | 2 +- .../contracts/lib/forge-std | 2 +- .../contracts/lib/tnt-core | 2 +- 7 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 76865f5d..d5829baa 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,15 @@ blueprint.lock blueprint-test-utils/db node_modules +bin/ +blueprint-test-utils/keystores +blueprints/incredible-squaring/bin +blueprints/incredible-squaring/contracts/lib/eigenlayer-middleware +blueprints/incredible-squaring/contracts/soldeer.lock +blueprints/incredible-squaring/foundry.toml +blueprints/incredible-squaring/keystores +blueprints/incredible-squaring/remappings.txt +blueprints/incredible-squaring/soldeer.lock +foundry.toml +remappings.txt +soldeer.lock \ No newline at end of file diff --git a/blueprint-manager/src/executor/event_handler.rs b/blueprint-manager/src/executor/event_handler.rs index 77d9c163..6c1a7daa 100644 --- a/blueprint-manager/src/executor/event_handler.rs +++ b/blueprint-manager/src/executor/event_handler.rs @@ -69,7 +69,7 @@ pub(crate) async fn check_blueprint_events( active_gadgets: &mut ActiveGadgets, account_id: &AccountId32, ) -> EventPollResult { - let pre_registation_events = event.events.find::(); + let pre_registration_events = event.events.find::(); let registered_events = event.events.find::(); let unregistered_events = event.events.find::(); let service_initiated_events = event.events.find::(); @@ -78,16 +78,16 @@ pub(crate) async fn check_blueprint_events( let mut result = EventPollResult::default(); - for evt in pre_registation_events { + for evt in pre_registration_events { match evt { Ok(evt) => { if &evt.operator == account_id { result.blueprint_registrations.push(evt.blueprint_id); - info!("Pre-registered event: {evt:?}"); + info!("[Blueprint Manager] Pre-registered event: {evt:?}"); } } Err(err) => { - warn!("Error handling pre-registered event: {err:?}"); + warn!("[Blueprint Manager] Error handling pre-registered event: {err:?}"); } } } @@ -96,11 +96,11 @@ pub(crate) async fn check_blueprint_events( for evt in registered_events { match evt { Ok(evt) => { - info!("Registered event: {evt:?}"); + info!("[Blueprint Manager] Registered event: {evt:?}"); result.needs_update = true; } Err(err) => { - warn!("Error handling registered event: {err:?}"); + warn!("[Blueprint Manager] Error handling registered event: {err:?}"); } } } @@ -109,16 +109,15 @@ pub(crate) async fn check_blueprint_events( for evt in unregistered_events { match evt { Ok(evt) => { - info!("Unregistered event: {evt:?}"); + info!("[Blueprint Manager] Unregistered event: {evt:?}"); if &evt.operator == account_id && active_gadgets.remove(&evt.blueprint_id).is_some() { - info!("Removed services for blueprint_id: {}", evt.blueprint_id,); - + info!("[Blueprint Manager] Removed services for blueprint_id: {}", evt.blueprint_id,); result.needs_update = true; } } Err(err) => { - warn!("Error handling unregistered event: {err:?}"); + warn!("[Blueprint Manager] Error handling unregistered event: {err:?}"); } } } @@ -127,10 +126,10 @@ pub(crate) async fn check_blueprint_events( for evt in service_initiated_events { match evt { Ok(evt) => { - info!("Service initiated event: {evt:?}"); + info!("[Blueprint Manager] Service initiated event: {evt:?}"); } Err(err) => { - warn!("Error handling service initiated event: {err:?}"); + warn!("[Blueprint Manager] Error handling service initiated event: {err:?}"); } } } @@ -139,10 +138,10 @@ pub(crate) async fn check_blueprint_events( for evt in job_called_events { match evt { Ok(evt) => { - info!("Job called event: {evt:?}"); + info!("[Blueprint Manager] Job called event: {evt:?}"); } Err(err) => { - warn!("Error handling job called event: {err:?}"); + warn!("[Blueprint Manager] Error handling job called event: {err:?}"); } } } @@ -151,10 +150,10 @@ pub(crate) async fn check_blueprint_events( for evt in job_result_submitted_events { match evt { Ok(evt) => { - info!("Job result submitted event: {evt:?}"); + info!("[Blueprint Manager] Job result submitted event: {evt:?}"); } Err(err) => { - warn!("Error handling job result submitted event: {err:?}"); + warn!("[Blueprint Manager] Error handling job result submitted event: {err:?}"); } } } diff --git a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std index 1de6eecf..d3db4ef9 160000 --- a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std +++ b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f +Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d diff --git a/blueprints/incredible-squaring-symbiotic/contracts/lib/core b/blueprints/incredible-squaring-symbiotic/contracts/lib/core index f38f1b16..2a5f6f0f 160000 --- a/blueprints/incredible-squaring-symbiotic/contracts/lib/core +++ b/blueprints/incredible-squaring-symbiotic/contracts/lib/core @@ -1 +1 @@ -Subproject commit f38f1b16b8207dcff55d681a0d5ba28c66e785c8 +Subproject commit 2a5f6f0fcee9a8d0ace03c38c77a352c5e5f95ae diff --git a/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std b/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std index 1eea5bae..d3db4ef9 160000 --- a/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std +++ b/blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 1eea5bae12ae557d589f9f0f0edae2faa47cb262 +Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d diff --git a/blueprints/incredible-squaring/contracts/lib/forge-std b/blueprints/incredible-squaring/contracts/lib/forge-std index 1de6eecf..d3db4ef9 160000 --- a/blueprints/incredible-squaring/contracts/lib/forge-std +++ b/blueprints/incredible-squaring/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f +Subproject commit d3db4ef90a72b7d24aa5a2e5c649593eaef7801d diff --git a/blueprints/incredible-squaring/contracts/lib/tnt-core b/blueprints/incredible-squaring/contracts/lib/tnt-core index c1fa9c7c..df6d5d6d 160000 --- a/blueprints/incredible-squaring/contracts/lib/tnt-core +++ b/blueprints/incredible-squaring/contracts/lib/tnt-core @@ -1 +1 @@ -Subproject commit c1fa9c7c3c5891aab9bd25002a434d93c54942cd +Subproject commit df6d5d6da3c82217405c408d3c0b11369bb3e5c2