@layerzerolabs/protocol-stellar-v2 0.2.19 → 0.2.20

package/Cargo.lock

@@ -339,6 +339,7 @@ dependencies = [
  "executor",
  "executor-fee-lib",
  "executor-helper",
+ "fee-lib-interfaces",
  "k256",
  "message-lib-common",
  "oapp",
@@ -607,6 +608,7 @@ dependencies = [
  "common-macros",
  "ed25519-dalek",
  "endpoint-v2",
+ "fee-lib-interfaces",
  "insta",
  "k256",
  "message-lib-common",
@@ -622,10 +624,10 @@ name = "dvn-fee-lib"
 version = "0.0.1"
 dependencies = [
  "common-macros",
+ "fee-lib-interfaces",
  "message-lib-common",
  "soroban-sdk",
  "utils",
- "worker",
 ]
 
 [[package]]
@@ -740,6 +742,7 @@ dependencies = [
  "cfg-if",
  "common-macros",
  "endpoint-v2",
+ "fee-lib-interfaces",
  "message-lib-common",
  "soroban-sdk",
  "utils",
@@ -751,10 +754,10 @@ name = "executor-fee-lib"
 version = "0.0.1"
 dependencies = [
  "common-macros",
+ "fee-lib-interfaces",
  "message-lib-common",
  "soroban-sdk",
  "utils",
- "worker",
 ]
 
 [[package]]
@@ -769,6 +772,13 @@ dependencies = [
  "worker",
 ]
 
+[[package]]
+name = "fee-lib-interfaces"
+version = "0.0.1"
+dependencies = [
+ "soroban-sdk",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.1"
@@ -1298,9 +1308,9 @@ name = "price-feed"
 version = "0.0.1"
 dependencies = [
  "common-macros",
+ "fee-lib-interfaces",
  "soroban-sdk",
  "utils",
- "worker",
 ]
 
 [[package]]

package/Cargo.toml

@@ -26,6 +26,7 @@ uln302 = { path = "contracts/message-libs/uln-302", default-features = false }
 oapp = { path = "contracts/oapps/oapp" }
 simple-message-lib = { path = "contracts/message-libs/simple-message-lib" }
 treasury = { path = "contracts/message-libs/treasury" }
+fee-lib-interfaces = { path = "contracts/workers/fee-lib-interfaces" }
 worker = { path = "contracts/workers/worker" }
 executor = { path = "contracts/workers/executor" }
 executor-helper = { path = "contracts/workers/executor-helper" }
@@ -34,6 +35,7 @@ dvn = { path = "contracts/workers/dvn" }
 dvn-fee-lib = { path = "contracts/workers/dvn-fee-lib" }
 price-feed = { path = "contracts/workers/price-feed" }
 oft-core = { path = "contracts/oapps/oft-core" }
+oft = { path = "contracts/oapps/oft" }
 stellar-macros = { git = "https://github.com/OpenZeppelin/stellar-contracts.git", tag = "v0.5.1" }
 stellar-tokens = { git = "https://github.com/OpenZeppelin/stellar-contracts.git", tag = "v0.5.1" }
 stellar-contract-utils = { git = "https://github.com/OpenZeppelin/stellar-contracts.git", tag = "v0.5.1" }

package/contracts/ERROR_SPEC.md

@@ -23,6 +23,12 @@ Each library has a unique error code range to:
     - UpgradeableError: 1050-1059
     - MultisigError: 1060-1069
 
+    Example from `oft/extensions` (3100-3199):
+
+    - OFTFeeError: 3100-3109
+    - OFTPausableError: 3110-3119
+    - RateLimitError: 3120-3129
+
     If an error type exceeds 10 errors (e.g., 12 errors), it extends into the next block but the following error type should start at the next 10-unit boundary (e.g., if errors are 1000-1011, next sub-range starts at 1020).
 
 - **Auto-increment**: Within each error enum, values auto-increment from the starting value.
@@ -39,6 +45,7 @@ Each library has a unique error code range to:
 | 2000 - 2099 | OApp Lib        | oapp               | `oapps/oapp/src/errors.rs`                                   |
 | 2100 - 2999 | OApp Lib        | (reserved)         | Future OApp libs                                             |
 | 3000 - 3099 | OFT Lib         | oft-core           | `oapps/oft-core/src/errors.rs`                               |
-| 3100 - 3999 | OFT Lib         | (reserved)         | Future OFT libs                                              |
+| 3100 - 3199 | OFT Lib         | oft (extensions)   | `oapps/oft/src/extensions/`                                  |
+| 3200 - 3999 | OFT Lib         | (reserved)         | Future OFT libs                                              |
 
 ---

package/contracts/common-macros/src/contract_ttl.rs

@@ -4,6 +4,9 @@ use quote::quote;
 use syn::{ImplItem, ItemImpl, ItemTrait, TraitItem, Visibility};
 
 /// Generates a `#[soroban_sdk::contractimpl]` with automatic instance TTL extension.
+///
+/// - For `__constructor` methods: injects `ttl_configurable::init_default_ttl_configs(env)`
+/// - For other methods: injects TTL extension logic to extend instance TTL if configured
 pub fn contractimpl_with_ttl(attr: TokenStream, input: TokenStream) -> TokenStream {
     let mut impl_block: ItemImpl = syn::parse2(input).unwrap_or_else(|e| panic!("failed to parse impl block: {}", e));
 
@@ -17,16 +20,16 @@ pub fn contractimpl_with_ttl(attr: TokenStream, input: TokenStream) -> TokenStre
             continue;
         }
 
-        // Skip the constructor as TTL config is typically not set during initialization
-        if method.sig.ident == "__constructor" {
-            continue;
-        }
-
         // Skip methods without Env parameter
         let Some(env_param) = utils::find_env_param(&method.sig.inputs) else { continue };
 
-        // Inject TTL extension at the start of the method body
-        method.block.stmts.insert(0, extend_instance_ttl_stmt(&env_param));
+        if method.sig.ident == "__constructor" {
+            // Inject default TTL config initialization in constructor
+            method.block.stmts.insert(0, init_default_ttl_configs_stmt(&env_param));
+        } else {
+            // Inject TTL extension at the start of other methods
+            method.block.stmts.insert(0, extend_instance_ttl_stmt(&env_param));
+        }
     }
 
     let contract_attr = if attr.is_empty() {
@@ -72,6 +75,14 @@ pub fn contracttrait_with_ttl(attr: TokenStream, input: TokenStream) -> TokenStr
     }
 }
 
+/// Generates a statement that initializes default TTL configs in the constructor.
+fn init_default_ttl_configs_stmt(env_param: &utils::EnvParam<'_>) -> syn::Stmt {
+    let env_ident = env_param.ident;
+    syn::parse_quote! {
+        utils::ttl_configurable::init_default_ttl_configs(#env_ident);
+    }
+}
+
 /// Generates a statement that extends instance TTL if configured.
 fn extend_instance_ttl_stmt(env_param: &utils::EnvParam<'_>) -> syn::Stmt {
     let env_ref = env_param.as_ref_tokens();

package/contracts/common-macros/src/lib.rs

@@ -386,9 +386,9 @@ pub fn contract_trait(attr: TokenStream, item: TokenStream) -> TokenStream {
 // Upgradeable Macro
 // ============================================================================
 
-/// Generates upgradeable implementation with auth-based access control.
+/// Generates upgradeable implementation using the `Upgradeable` trait's default methods.
 ///
-/// Implements the `Upgradeable` trait for contract upgrade and migration functionality.
+/// This macro implements `Upgradeable` using the trait's default methods (which include auth).
 ///
 /// # Requirements
 /// - The contract must implement the `Auth` trait (via `#[ownable]` or `Multisig`)
@@ -403,7 +403,7 @@ pub fn contract_trait(attr: TokenStream, item: TokenStream) -> TokenStream {
 /// impl utils::upgradeable::UpgradeableInternal for MyContract {
 ///     type MigrationData = ();
 ///
-///     fn _migrate(env: &Env, migration_data: &Self::MigrationData) {
+///     fn __migrate(env: &Env, migration_data: &Self::MigrationData) {
 ///         // Migration logic here
 ///     }
 /// }
@@ -411,7 +411,7 @@ pub fn contract_trait(attr: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// Generated code includes:
 /// - `upgrade(env, new_wasm_hash)` - Upgrades the contract WASM (auth required)
-/// - `migrate(env, migration_data)` - Runs migration after upgrade (auth required)
+/// - `migrate(env, migration_data)` - Runs migration after upgrade (auth required, XDR-decodes `Bytes` to `MigrationData`)
 /// - `contractmeta!` with `binver` set to the Cargo package version (if not 0.0.0)
 #[proc_macro_attribute]
 pub fn upgradeable(_attr: TokenStream, item: TokenStream) -> TokenStream {

package/contracts/common-macros/src/tests/contract_ttl.rs

@@ -49,7 +49,7 @@ fn snapshot_generated_contractimpl_code() {
                 value * 7
             }
 
-            /// Constructor method - should NOT have TTL extension
+            /// Constructor method - should have init_default_ttl_configs
             pub fn __constructor(env: &Env, value: u32) {
                 let _ = value * 2;
             }

package/contracts/common-macros/src/tests/snapshots/common_macros__tests__contract_ttl__snapshot_generated_contractimpl_code.snap

@@ -52,8 +52,9 @@ impl MyContract {
     pub(crate) fn pub_crate_with_env(env: Env, value: u32) -> u32 {
         value * 7
     }
-    /// Constructor method - should NOT have TTL extension
+    /// Constructor method - should have init_default_ttl_configs
     pub fn __constructor(env: &Env, value: u32) {
+        utils::ttl_configurable::init_default_ttl_configs(env);
         let _ = value * 2;
     }
 }

package/contracts/common-macros/src/tests/snapshots/common_macros__tests__upgradeable__snapshot_generated_upgradeable_code.snap

@@ -6,16 +6,11 @@ expression: formatted
 pub struct MyContract;
 use utils::upgradeable::Upgradeable as _;
 soroban_sdk::contractmeta!(key = "binver", val = "0.0.1");
-type MigrationData = <MyContract as utils::upgradeable::UpgradeableInternal>::MigrationData;
-/// Implement the Upgradeable trait for the contract.
-#[common_macros::contract_impl]
-impl utils::upgradeable::Upgradeable for MyContract {
-    #[common_macros::only_auth]
-    fn upgrade(env: &soroban_sdk::Env, new_wasm_hash: soroban_sdk::BytesN<32>) {
-        utils::upgradeable::upgrade(env, new_wasm_hash)
-    }
-    #[common_macros::only_auth]
-    fn migrate(env: &soroban_sdk::Env, migration_data: &MigrationData) {
-        utils::upgradeable::migrate::<Self>(env, migration_data)
-    }
+#[doc(hidden)]
+mod __upgradeable_impl_my_contract {
+    use super::*;
+    use soroban_sdk::{Bytes, BytesN};
+    use utils::upgradeable::{Upgradeable, UpgradeableInternal};
+    #[common_macros::contract_impl(contracttrait)]
+    impl Upgradeable for MyContract {}
 }

package/contracts/common-macros/src/upgradeable.rs

@@ -1,3 +1,6 @@
+//! Upgradeable macro for Stellar smart contracts.
+
+use crate::utils;
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::ItemStruct;
@@ -10,7 +13,7 @@ use syn::ItemStruct;
 ///
 /// # Behavior
 ///
-/// - Implements the `upgrade` and `migrate` functions with auth-based access control.
+/// - Implements the `Upgradeable` trait using its default methods (which include auth).
 /// - Sets the contract crate version as `"binver"` metadata using
 ///   `soroban_sdk::contractmeta!`. Gets the crate version via the env variable
 ///   `CARGO_PKG_VERSION` which corresponds to the "version" attribute in
@@ -26,35 +29,26 @@ use syn::ItemStruct;
 pub fn generate_upgradeable_impl(input: TokenStream) -> TokenStream {
     let item_struct: ItemStruct = syn::parse2(input).unwrap_or_else(|e| panic!("failed to parse struct: {}", e));
     let name = &item_struct.ident;
+    let impl_mod = utils::impl_mod_ident(name, "upgradeable");
 
     let binver = set_binver_from_env();
 
-    let upgradeable_impl = quote! {
+    quote! {
+        #item_struct
+
         use utils::upgradeable::Upgradeable as _;
 
         #binver
 
-        // Type alias to avoid path complexity in contractimpl
-        type MigrationData = <#name as utils::upgradeable::UpgradeableInternal>::MigrationData;
+        #[doc(hidden)]
+        mod #impl_mod {
+            use super::*;
+            use soroban_sdk::{Bytes, BytesN};
+            use utils::upgradeable::{Upgradeable, UpgradeableInternal};
 
-        /// Implement the Upgradeable trait for the contract.
-        #[common_macros::contract_impl]
-        impl utils::upgradeable::Upgradeable for #name {
-            #[common_macros::only_auth]
-            fn upgrade(env: &soroban_sdk::Env, new_wasm_hash: soroban_sdk::BytesN<32>) {
-                utils::upgradeable::upgrade(env, new_wasm_hash)
-            }
-
-            #[common_macros::only_auth]
-            fn migrate(env: &soroban_sdk::Env, migration_data: &MigrationData) {
-                utils::upgradeable::migrate::<Self>(env, migration_data)
-            }
+            #[common_macros::contract_impl(contracttrait)]
+            impl Upgradeable for #name {}
         }
-    };
-
-    quote! {
-        #item_struct
-        #upgradeable_impl
     }
 }
 

package/contracts/message-libs/uln-302/src/events.rs

@@ -58,12 +58,16 @@ pub struct DefaultReceiveUlnConfigsSet {
 pub struct ExecutorFeePaid {
     #[topic]
     pub executor: Address,
+    #[topic]
+    pub guid: BytesN<32>,
     pub fee: FeeRecipient,
 }
 
 #[contractevent]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct DVNFeePaid {
+    #[topic]
+    pub guid: BytesN<32>,
     pub dvns: Vec<Address>,
     pub fees: Vec<FeeRecipient>,
 }

package/contracts/message-libs/uln-302/src/send_uln.rs

@@ -63,12 +63,25 @@ impl ISendLib for Uln302 {
             prepare_packet_and_options(env, packet, options);
 
         // Executor fee
-        let executor_fee_recipient =
-            Self::assign_executor(env, &packet.sender, packet.dst_eid, packet.message.len(), &executor_options);
+        let executor_fee_recipient = Self::assign_executor(
+            env,
+            &packet.guid,
+            &packet.sender,
+            packet.dst_eid,
+            packet.message.len(),
+            &executor_options,
+        );
 
         // DVNs fees
-        let dvns_fee_recipients =
-            Self::assign_dvns(env, &packet.sender, packet.dst_eid, &packet_header, &payload_hash, &dvn_options);
+        let dvns_fee_recipients = Self::assign_dvns(
+            env,
+            &packet.guid,
+            &packet.sender,
+            packet.dst_eid,
+            &packet_header,
+            &payload_hash,
+            &dvn_options,
+        );
 
         // Collect all worker fees
         let mut native_fee_recipients = vec![env, executor_fee_recipient];
@@ -257,6 +270,7 @@ impl Uln302 {
     /// Assigns an executor job and returns the fee recipient.
     fn assign_executor(
         env: &Env,
+        guid: &BytesN<32>,
         sender: &Address,
         dst_eid: u32,
         message_length: u32,
@@ -270,13 +284,15 @@ impl Uln302 {
         let recipient =
             executor_client.assign_job(&env.current_contract_address(), sender, &dst_eid, &message_length, options);
 
-        ExecutorFeePaid { executor: executor_client.address.clone(), fee: recipient.clone() }.publish(env);
+        ExecutorFeePaid { guid: guid.clone(), executor: executor_client.address.clone(), fee: recipient.clone() }
+            .publish(env);
         recipient
     }
 
     /// Assigns DVN jobs and returns fee recipients for all DVNs.
     fn assign_dvns(
         env: &Env,
+        guid: &BytesN<32>,
         sender: &Address,
         dst_eid: u32,
         packet_header: &Bytes,
@@ -305,7 +321,7 @@ impl Uln302 {
             dvns.push_back(dvn_addr);
         }
 
-        DVNFeePaid { dvns, fees: fees.clone() }.publish(env);
+        DVNFeePaid { guid: guid.clone(), dvns, fees: fees.clone() }.publish(env);
         fees
     }
 }

package/contracts/message-libs/uln-302/src/tests/send_uln302/send.rs

@@ -76,10 +76,18 @@ fn test_send_events_emittance() {
         &setup.env,
         &setup.uln302.address,
         &[
-            ExecutorFeePaid { executor: executor.clone(), fee: native_fee_recipients.get(0).unwrap().clone() }
-                .expected(&setup.env),
-            DVNFeePaid { dvns: dvns.slice(0..2).clone(), fees: native_fee_recipients.slice(1..3).clone() }
-                .expected(&setup.env),
+            ExecutorFeePaid {
+                executor: executor.clone(),
+                guid: packet.guid.clone(),
+                fee: native_fee_recipients.get(0).unwrap().clone(),
+            }
+            .expected(&setup.env),
+            DVNFeePaid {
+                guid: packet.guid.clone(),
+                dvns: dvns.slice(0..2).clone(),
+                fees: native_fee_recipients.slice(1..3).clone(),
+            }
+            .expected(&setup.env),
         ],
     );
 
@@ -92,17 +100,11 @@ fn test_send_events_emittance() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[1],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[1], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
@@ -172,10 +174,18 @@ fn test_send_events_emittance_with_zro() {
         &setup.env,
         &setup.uln302.address,
         &[
-            ExecutorFeePaid { executor: executor.clone(), fee: native_fee_recipients.get(0).unwrap().clone() }
-                .expected(&setup.env),
-            DVNFeePaid { dvns: dvns.slice(0..2).clone(), fees: native_fee_recipients.slice(1..3).clone() }
-                .expected(&setup.env),
+            ExecutorFeePaid {
+                executor: executor.clone(),
+                guid: packet.guid.clone(),
+                fee: native_fee_recipients.get(0).unwrap().clone(),
+            }
+            .expected(&setup.env),
+            DVNFeePaid {
+                guid: packet.guid.clone(),
+                dvns: dvns.slice(0..2).clone(),
+                fees: native_fee_recipients.slice(1..3).clone(),
+            }
+            .expected(&setup.env),
         ],
     );
 
@@ -188,17 +198,11 @@ fn test_send_events_emittance_with_zro() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[1],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[1], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient() }
     );
     assert_eq!(
         zro_fee_recipients.get(0).unwrap(),
@@ -264,10 +268,7 @@ fn test_send_single_dvn() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
@@ -378,17 +379,11 @@ fn test_send_multiple_dvns() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[1],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[1], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
@@ -454,10 +449,7 @@ fn test_send_with_only_optional_dvns() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
@@ -628,17 +620,11 @@ fn test_send_with_missing_dvn_options() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[1],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[1], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
@@ -703,10 +689,7 @@ fn test_send_with_missing_executor_options() {
     );
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
@@ -804,26 +787,17 @@ fn test_send_derives_from_quote() {
     // DVN 0 (first required)
     assert_eq!(
         native_fee_recipients.get(1).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[0],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[0], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(0)).recipient() }
     );
     // DVN 1 (second required)
     assert_eq!(
         native_fee_recipients.get(2).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[1],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[1], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(1)).recipient() }
     );
     // DVN 2 (optional)
     assert_eq!(
         native_fee_recipients.get(3).unwrap(),
-        FeeRecipient {
-            amount: DVN_FEE[2],
-            to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(2)).recipient()
-        }
+        FeeRecipient { amount: DVN_FEE[2], to: DummyDVNClient::new(&setup.env, &dvns.get_unchecked(2)).recipient() }
     );
 
     // Treasury fee is last

package/contracts/oapps/counter/Cargo.toml

@@ -30,6 +30,7 @@ executor-fee-lib = { workspace = true }
 worker = { workspace = true }
 treasury = { workspace = true, features = ["testutils"] }
 price-feed = { workspace = true }
+fee-lib-interfaces = { workspace = true }
 executor-helper = { workspace = true }
 # For real DVN signature verification in integration tests
 k256 = "0.13"

package/contracts/oapps/counter/integration_tests/setup_uln.rs

@@ -13,6 +13,7 @@ use endpoint_v2::{EndpointV2, EndpointV2Client};
 use executor::{DstConfig as ExecutorDstConfig, ExecutorClient, LzExecutor, SetDstConfigParam};
 use executor_fee_lib::ExecutorFeeLib;
 use executor_helper::{ExecutorHelper, ExecutorHelperClient};
+use fee_lib_interfaces::Price;
 use price_feed::{types::UpdatePrice, LzPriceFeed};
 use soroban_sdk::{
     testutils::{Address as _, MockAuth, MockAuthInvoke},
@@ -25,7 +26,6 @@ use uln302::{
     Uln302, Uln302Client, UlnConfig,
 };
 use utils::{buffer_reader::BufferReader, buffer_writer::BufferWriter};
-use worker::Price;
 
 pub const CONFIRMATIONS: u64 = 1;
 pub const MAX_MESSAGE_SIZE: u32 = 10000;