feat!: enable cycles ledger unconditionally

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 # UNRELEASED
 
+### feat!: enable cycles ledger support unconditionally
+
 ### feat: add `dfx schema --for extension-manifest`
 
 The schema command can now output the schema for extension.json files.

e2e/tests-dfx/cycles-ledger.bash

@@ -356,9 +356,6 @@ current_time_nanoseconds() {
 }
 
 @test "top-up and deposit-cycles" {
-  # shellcheck disable=SC2030,SC2031
-  export DFX_CYCLES_LEDGER_SUPPORT_ENABLE=1
-
   start_and_install_nns
 
   dfx_new
@@ -561,9 +558,6 @@ current_time_nanoseconds() {
 }
 
 @test "canister creation" {
-  # shellcheck disable=SC2030,SC2031
-  export DFX_CYCLES_LEDGER_SUPPORT_ENABLE=1
-
   start_and_install_nns
 
   dfx_new temporary
@@ -645,9 +639,6 @@ current_time_nanoseconds() {
 }
 
 @test "canister deletion" {
-  # shellcheck disable=SC2030,SC2031
-  export DFX_CYCLES_LEDGER_SUPPORT_ENABLE=1
-
   start_and_install_nns
 
   dfx_new temporary
@@ -721,9 +712,6 @@ current_time_nanoseconds() {
 }
 
 @test "create canister on specific subnet" {
-  # shellcheck disable=SC2030,SC2031
-  export DFX_CYCLES_LEDGER_SUPPORT_ENABLE=1
-
   start_and_install_nns
 
   dfx_new temporary
@@ -762,9 +750,6 @@ current_time_nanoseconds() {
 
 @test "automatically choose subnet" {
   [[ "$USE_POCKETIC" ]] && skip "skipped for pocketic: subnet range"
-  # shellcheck disable=SC2030,SC2031
-  export DFX_CYCLES_LEDGER_SUPPORT_ENABLE=1
-
   dfx_start
 
   REGISTRY="rwlgt-iiaaa-aaaaa-aaaaa-cai"

e2e/tests-dfx/wallet.bash

@@ -228,7 +228,7 @@ teardown() {
   assert_command_fail dfx wallet balance
   assert_match "No wallet configured"
 
-  assert_command dfx wallet redeem-faucet-coupon --faucet "$(dfx canister id faucet)" 'valid-coupon'
+  assert_command dfx wallet redeem-faucet-coupon --faucet "$(dfx canister id faucet)" 'valid-coupon' --yes
   assert_match "Redeemed coupon valid-coupon for a new wallet"
   assert_match "New wallet set."
 
@@ -240,7 +240,7 @@ teardown() {
 
   unset DFX_DISABLE_AUTO_WALLET
 
-  assert_command dfx wallet redeem-faucet-coupon --faucet "$(dfx canister id faucet)" 'another-valid-coupon'
+  assert_command dfx wallet redeem-faucet-coupon --faucet "$(dfx canister id faucet)" 'another-valid-coupon' --yes
   assert_match "Redeemed coupon code another-valid-coupon for 10.000 TC"
 
   assert_command dfx wallet balance

src/dfx/src/commands/canister/delete.rs

@@ -6,9 +6,7 @@ use crate::lib::operations::canister;
 use crate::lib::operations::canister::{
     deposit_cycles, start_canister, stop_canister, update_settings,
 };
-use crate::lib::operations::cycles_ledger::{
-    cycles_ledger_enabled, wallet_deposit_to_cycles_ledger,
-};
+use crate::lib::operations::cycles_ledger::wallet_deposit_to_cycles_ledger;
 use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::util::assets::wallet_wasm;
 use crate::util::blob_from_arguments;
@@ -138,7 +136,7 @@ async fn delete_canister(
                         // If there is no wallet, then do not attempt to withdraw the cycles.
                         match wallet_canister_id(network, &identity_name)? {
                             Some(canister_id) => WithdrawTarget::Canister { canister_id },
-                            None if cycles_ledger_enabled() => {
+                            None => {
                                 let Some(my_principal) = env.get_selected_identity_principal()
                                 else {
                                     bail!("Identity has no principal attached")
@@ -150,7 +148,6 @@ async fn delete_canister(
                                     },
                                 }
                             }
-                            _ => WithdrawTarget::NoWithdrawal,
                         }
                     }
                 },

src/dfx/src/commands/canister/deposit_cycles.rs

@@ -3,7 +3,6 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use crate::lib::error::DfxResult;
 use crate::lib::identity::wallet::get_or_create_wallet_canister;
 use crate::lib::operations::canister;
-use crate::lib::operations::cycles_ledger::cycles_ledger_enabled;
 use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::{environment::Environment, operations::cycles_ledger};
 use crate::util::clap::parsers::{cycle_amount_parser, icrc_subaccount_parser};
@@ -57,10 +56,6 @@ async fn deposit_cycles(
 
     match call_sender {
         CallSender::SelectedId => {
-            if !cycles_ledger_enabled() {
-                // should be unreachable
-                bail!("No wallet configured");
-            }
             cycles_ledger::withdraw(
                 env.get_agent(),
                 env.get_logger(),
@@ -111,12 +106,12 @@ pub async fn exec(
                 call_sender = &proxy_sender;
             }
             Err(err) => {
-                if cycles_ledger_enabled() && matches!(err, crate::lib::identity::wallet::GetOrCreateWalletCanisterError::NoWalletConfigured { .. }) {
+                if matches!(err, crate::lib::identity::wallet::GetOrCreateWalletCanisterError::NoWalletConfigured { .. }) {
                     debug!(env.get_logger(), "No wallet configured");
                 } else {
                     bail!(err)
                 }
-            },
+            }
         }
     }
 

src/dfx/src/commands/wallet/redeem_faucet_coupon.rs

@@ -3,7 +3,6 @@ use crate::lib::diagnosis::DiagnosedError;
 use crate::lib::environment::Environment;
 use crate::lib::error::DfxResult;
 use crate::lib::identity::wallet::set_wallet_id;
-use crate::lib::operations::cycles_ledger::cycles_ledger_enabled;
 use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::util::{format_as_trillions, pretty_thousand_separators};
 use anyhow::{anyhow, bail, Context};
@@ -74,7 +73,7 @@ pub async fn exec(env: &dyn Environment, opts: RedeemFaucetCouponOpts) -> DfxRes
         }
         // identity has no wallet yet - faucet will provide one
         _ => {
-            if cycles_ledger_enabled() && !opts.yes {
+            if !opts.yes {
                 ask_for_consent("`dfx cycles` is now recommended instead of `dfx wallet`. Are you sure you want to create a new cycles wallet anyway?")?;
             }
             let identity = env

src/dfx/src/lib/cycles_ledger_types/mod.rs

@@ -1,4 +1,3 @@
-// TODO(FI-1022): Import types from cycles ledger crate once available
 pub mod create_canister;
 pub mod deposit;
 pub mod withdraw;

src/dfx/src/lib/operations/canister/create_canister.rs

@@ -7,7 +7,7 @@ use crate::lib::ic_attributes::CanisterSettings as DfxCanisterSettings;
 use crate::lib::identity::wallet::{get_or_create_wallet_canister, GetOrCreateWalletCanisterError};
 use crate::lib::ledger_types::MAINNET_CYCLE_MINTER_CANISTER_ID;
 use crate::lib::operations::canister::motoko_playground::reserve_canister_with_playground;
-use crate::lib::operations::cycles_ledger::{create_with_cycles_ledger, cycles_ledger_enabled};
+use crate::lib::operations::cycles_ledger::create_with_cycles_ledger;
 use crate::util::clap::subnet_selection_opt::SubnetSelectionType;
 use anyhow::{anyhow, bail, Context};
 use candid::Principal;
@@ -138,12 +138,10 @@ The command line value will be used.",
             {
                 Ok(wallet) => CallSender::Wallet(*wallet.canister_id_()),
                 Err(err) => {
-                    if cycles_ledger_enabled()
-                        && matches!(
-                            err,
-                            GetOrCreateWalletCanisterError::NoWalletConfigured { .. }
-                        )
-                    {
+                    if matches!(
+                        err,
+                        GetOrCreateWalletCanisterError::NoWalletConfigured { .. }
+                    ) {
                         debug!(env.get_logger(), "No wallet configured.");
                         *call_sender
                     } else {
@@ -158,7 +156,7 @@ The command line value will be used.",
         CallSender::SelectedId => {
             let auto_wallet_disabled = std::env::var("DFX_DISABLE_AUTO_WALLET").is_ok();
             let ic_network = env.get_network_descriptor().is_ic;
-            if cycles_ledger_enabled() && (ic_network || auto_wallet_disabled) {
+            if ic_network || auto_wallet_disabled {
                 create_with_cycles_ledger(
                     env,
                     agent,

src/dfx/src/lib/operations/cycles_ledger.rs

@@ -31,11 +31,6 @@ use icrc_ledger_types::icrc2::approve::ApproveError;
 use icrc_ledger_types::icrc2::transfer_from::TransferFromError;
 use slog::{info, Logger};
 
-/// Cycles ledger feature flag to turn off behavior that would be confusing while cycles ledger is not out of beta yet.
-pub fn cycles_ledger_enabled() -> bool {
-    std::env::var("DFX_CYCLES_LEDGER_SUPPORT_ENABLE").is_ok()
-}
-
 const ICRC1_BALANCE_OF_METHOD: &str = "icrc1_balance_of";
 const ICRC1_TRANSFER_METHOD: &str = "icrc1_transfer";
 const ICRC2_APPROVE_METHOD: &str = "icrc2_approve";