Interceptor > puppeteer + single action puppeteer

Cargo.toml

@@ -6,15 +6,17 @@ members = [
     "contracts/withdrawal-voucher",
     "contracts/withdrawal-manager",
     "contracts/factory",
-    "contracts/interchain-interceptor",
-    "contracts/interchain-interceptor-authz",
+    "contracts/puppeteer",
+    "contracts/puppeteer-authz",
     "contracts/validators-stats",
     "contracts/token",
     "contracts/validators-set",
     "contracts/strategy",
+    "contracts/hook-tester",
     "contracts/core",
-    "packages/interchain-interceptor-base",
+    "packages/puppeteer-base",
     "packages/base",
+    "packages/helpers",
 ]
 
 resolver = "2"
@@ -47,8 +49,9 @@ serde-json-wasm = { version = "1.0.0" }
 sha2 = { version = "0.10.8" }
 bech32 = { version = "0.9.1" }
 
-lido-interchain-interceptor-base = { path = "./packages/interchain-interceptor-base", default-features = false }
+lido-puppeteer-base = { path = "./packages/puppeteer-base", default-features = false }
 lido-staking-base = { path = "./packages/base", default-features = false }
+lido-helpers = { path = "./packages/helpers", default-features = false }
 thiserror = "1.0.50"
 
 [profile.release]

contracts/core/Cargo.toml

@@ -40,6 +40,7 @@ serde = { workspace = true }
 serde-json-wasm = { workspace = true }
 thiserror = { workspace = true }
 lido-staking-base = { workspace = true }
+lido-helpers = { workspace = true }
 neutron-sdk = { workspace = true }
 
 [dev-dependencies]

contracts/core/src/contract.rs

@@ -5,7 +5,7 @@ use cosmwasm_std::{
 };
 use cw2::set_contract_version;
 
-use lido_staking_base::helpers::answer::response;
+use lido_helpers::answer::response;
 use lido_staking_base::msg::{
     core::{ExecuteMsg, InstantiateMsg, QueryMsg},
     token::ExecuteMsg as TokenExecuteMsg,

contracts/distribution/Cargo.toml

@@ -23,26 +23,27 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
-cosmos-sdk-proto  = { workspace = true }
-prost             = { workspace = true }
-prost-types       = { workspace = true }
-protobuf          = { workspace = true }
-tendermint-proto  = { workspace = true }
-thiserror         = { workspace = true }
-
-cosmwasm-schema   = { workspace = true }
-cosmwasm-std      = { workspace = true }
-cw-storage-plus   = { workspace = true }
-cw-ownable        = { workspace = true }
-cw2               = { workspace = true }
-cw20              = { workspace = true }
-schemars          = { workspace = true }
-serde             = { workspace = true }
-serde-json-wasm   = { workspace = true }
-
-neutron-sdk       = { workspace = true }
+cosmos-sdk-proto = { workspace = true }
+prost = { workspace = true }
+prost-types = { workspace = true }
+protobuf = { workspace = true }
+tendermint-proto = { workspace = true }
+thiserror = { workspace = true }
+
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cw-storage-plus = { workspace = true }
+cw-ownable = { workspace = true }
+cw2 = { workspace = true }
+cw20 = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
+serde-json-wasm = { workspace = true }
+
+neutron-sdk = { workspace = true }
 lido-staking-base = { workspace = true }
+lido-helpers = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-storage  = { workspace = true }
-cw-multi-test     = { workspace = true }
+cosmwasm-storage = { workspace = true }
+cw-multi-test = { workspace = true }

contracts/distribution/src/contract.rs

@@ -1,6 +1,7 @@
-use cosmwasm_std::{entry_point, to_json_binary, Decimal, Deps, Event, Uint128};
+use cosmwasm_std::{entry_point, to_json_binary, Attribute, Decimal, Deps, Uint128};
 use cosmwasm_std::{Binary, DepsMut, Env, MessageInfo, Response};
 use cw2::set_contract_version;
+use lido_helpers::answer::response;
 use lido_staking_base::error::distribution::{ContractError, ContractResult};
 use lido_staking_base::msg::distribution::{Delegation, IdealDelegation, InstantiateMsg, QueryMsg};
 use neutron_sdk::bindings::msg::NeutronMsg;
@@ -17,7 +18,8 @@ pub fn instantiate(
 ) -> ContractResult<Response<NeutronMsg>> {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
 
-    Ok(Response::new().add_event(Event::new(format!("{}-{}", CONTRACT_NAME, "instantiate"))))
+    let empty_attr: Vec<Attribute> = Vec::new();
+    Ok(response("instantiate", CONTRACT_NAME, empty_attr))
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]

contracts/factory/Cargo.toml

@@ -40,6 +40,7 @@ serde = { workspace = true }
 serde-json-wasm = { workspace = true }
 thiserror = { workspace = true }
 lido-staking-base = { workspace = true }
+lido-helpers = { workspace = true }
 neutron-sdk = { workspace = true }
 
 [dev-dependencies]

contracts/factory/src/contract.rs

@@ -8,9 +8,8 @@ use cosmwasm_std::{
     Deps, DepsMut, Env, HexBinary, MessageInfo, Response, StdResult, WasmMsg,
 };
 use cw2::set_contract_version;
-
+use lido_helpers::answer::response;
 use lido_staking_base::{
-    helpers::answer::response,
     msg::core::{ExecuteMsg as CoreExecuteMsg, InstantiateMsg as CoreInstantiateMsg},
     msg::distribution::InstantiateMsg as DistributionInstantiateMsg,
     msg::strategy::InstantiateMsg as StrategyInstantiateMsg,

contracts/hook-tester/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+schema = "run --bin lido-hook-tester-schema"