Merge branch 'main' into pen-364-minting-per-canister

README.md

@@ -160,7 +160,6 @@ let obtain_cycles_config = ObtainCyclesOptions {
         )),
         from_subaccount: Subaccount::from(DEFAULT_SUBACCOUNT),
     }),
-    top_up_self: true,
 };
 
 funding_options.with_obtain_cycles_options(Some(obtain_cycles_config));
@@ -223,7 +222,11 @@ fn initialize() {
         ),
     );
 
-    // Funding canister is automatically registered
+    // Note: the funding canister is NOT automatically registered
+    fund_manager.register(
+        id(),
+        RegisterOpts::new(),
+    );
 
     fund_manager.start();
 }

canfund-rs/src/manager/mod.rs

@@ -97,14 +97,10 @@ impl Default for FundManager {
 impl FundManager {
     /// Creates a new fund manager with the specified options.
     pub fn new() -> Self {
-        let mut manager = FundManager {
+        FundManager {
             inner: FundManagerCore::new(),
             tracker: None,
-        };
-
-        manager.register(id(), RegisterOpts::new());
-
-        manager
+        }
     }
 
     /// Configures the fund manager with the specified options.
@@ -195,6 +191,7 @@ impl FundManager {
     }
 
     /// Executes the scheduled monitoring of the canisters and fund them if needed.
+    #[allow(clippy::too_many_lines)]
     async fn execute_scheduled_monitoring(manager: Rc<RefCell<FundManagerCore>>) {
         // Lock the process execution to prevent concurrent executions, it is dropped automatically
         // when it goes out of scope.
@@ -236,7 +233,7 @@ impl FundManager {
                     // Get the current balance.
                     let funding_canister_balance = ic_cdk::api::canister_balance128();
 
-                    // Get the record of the funding canister, if it exists, to access the previsous cycles balance to calculate estimated runtime left.
+                    // Get the record of the funding canister, if it exists, to access the previous cycles balance to calculate estimated runtime left.
                     let maybe_funding_canister_record =
                         manager.borrow().canisters.get(&id()).cloned();
 
@@ -248,8 +245,7 @@ impl FundManager {
                         ),
                         maybe_funding_canister_record
                             .as_ref()
-                            .map(|record| record.get_average_consumption() as u128)
-                            .unwrap_or(0),
+                            .map_or(0, |record| record.get_average_consumption() as u128),
                         &maybe_funding_canister_record
                             .as_ref()
                             .and_then(|record| record.get_strategy().clone())
@@ -271,11 +267,6 @@ impl FundManager {
                         .or_else(|| manager.borrow().options.obtain_cycles_options().clone());
 
                     if let Some(obtain_cycles_options) = maybe_obtain_cycles {
-                        if canister_id == id() && !obtain_cycles_options.top_up_self {
-                            // Obtaining cycles solely for topping up the funding canister is disabled.
-                            continue;
-                        }
-
                         ic_cdk::println!(
                             "Topping up {} with {} cycles",
                             canister_id,

canfund-rs/src/manager/options.rs

@@ -173,8 +173,6 @@ impl Default for FundStrategy {
 pub struct ObtainCyclesOptions {
     /// How to obtain cycles when the funding canister balance gets low.
     pub obtain_cycles: Arc<dyn ObtainCycles>,
-    /// If canfund should use obtain_cycles to top up the canister balance canfund is running on.
-    pub top_up_self: bool,
 }
 
 #[derive(Debug, Clone)]

examples/advanced_funding/Cargo.toml

@@ -9,7 +9,7 @@ path = "src/lib.rs"
 
 [dependencies]
 candid = { workspace = true }
-canfund = { path = "../../canfund-rs", version = "0.2.0" }
+canfund = { path = "../../canfund-rs" }
 ic-cdk = { workspace = true }
 ic-cdk-macros = { workspace = true }
 ic-ledger-types = { workspace = true }

examples/advanced_funding/src/lib.rs

@@ -81,9 +81,7 @@ pub fn start_canister_cycles_monitoring(config: FundingConfig) {
             );
         }
 
-        // The funding canister itself is also registered for monitoring by default. We can override
-        // the strategy by re-registering it.
-        fund_manager.unregister(id());
+        // The funding canister itself can also be monitored.
         fund_manager.register(
             id(),
             RegisterOpts::new()
@@ -109,7 +107,6 @@ pub fn get_obtain_cycles_config() -> Option<ObtainCyclesOptions> {
             )),
             from_subaccount: DEFAULT_SUBACCOUNT,
         }),
-        top_up_self: true,
     })
 }
 

examples/simple_funding/Cargo.toml

@@ -9,7 +9,7 @@ path = "src/lib.rs"
 
 [dependencies]
 candid = { workspace = true }
-canfund = { path = "../../canfund-rs", version = "0.2.0" }
+canfund = { path = "../../canfund-rs" }
 ic-cdk = { workspace = true }
 ic-cdk-macros = { workspace = true }
 ic-ledger-types = { workspace = true }