dfinity · maciejdfinity · Oct 20, 2025 · Sep 29, 2025 · Sep 29, 2025 · Sep 30, 2025
diff --git a/Cargo.lock b/Cargo.lock
@@ -43,11 +43,13 @@ pub fn validate(block: &Value) -> Result<(), ValuePredicateFailures> {
         icrc1_common.clone(),
         item("op", Required, is(Value::text("burn"))),
         item("from", Required, is_account.clone()),
+        item("fee", Optional, is_amount.clone()),
     ]);
     let is_icrc1_mint = and(vec![
         icrc1_common.clone(),
         item("op", Required, is(Value::text("mint"))),
         item("to", Required, is_account.clone()),
+        item("fee", Optional, is_amount.clone()),
     ]);
     let is_icrc2_approve = and(vec![
         icrc1_common.clone(),

@@ -22,6 +22,7 @@ pub struct Mint {
     pub to: Account,
     pub memo: Option<Memo>,
     pub created_at_time: Option<u64>,
+    pub fee: Option<Nat>,
 }
 
 #[derive(CandidType, Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
@@ -31,6 +32,7 @@ pub struct Burn {
     pub spender: Option<Account>,
     pub memo: Option<Memo>,
     pub created_at_time: Option<u64>,
+    pub fee: Option<Nat>,
 }
 
 #[derive(CandidType, Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]

@@ -440,6 +440,7 @@ mod withdraw_erc20 {
                             .unwrap(),
                     })),
                     created_at_time: None,
+                    fee: None,
                 });
 
             let balance_after_withdrawal = ckerc20.cketh.balance_of(caller);
@@ -485,6 +486,7 @@ mod withdraw_erc20 {
                         withdrawal_id: cketh_burn_index.into(),
                     })),
                     created_at_time: None,
+                    fee: None,
                 });
         }
 
@@ -725,6 +727,7 @@ mod withdraw_erc20 {
                         .unwrap(),
                 })),
                 created_at_time: None,
+                fee: None,
             })
             .call_ckerc20_ledger_get_transaction(
                 deposit_params.token().ledger_canister_id,
@@ -744,6 +747,7 @@ mod withdraw_erc20 {
                         .unwrap(),
                 })),
                 created_at_time: None,
+                fee: None,
             });
 
             let expected_cketh_balance_after_withdrawal =
@@ -873,6 +877,7 @@ mod withdraw_erc20 {
                             tx_hash: DEFAULT_CKERC20_WITHDRAWAL_TRANSACTION_HASH.parse().unwrap(),
                         })),
                         created_at_time: None,
+                        fee: None,
                     });
             }
         }
@@ -1361,6 +1366,7 @@ fn should_deposit_ckerc20() {
                     log_index: params.transaction_data().log_index.into(),
                 })),
                 created_at_time: None,
+                fee: None,
             });
     }
 }
@@ -1454,6 +1460,7 @@ fn should_deposit_cketh_and_ckerc20() {
                     log_index: cketh_params.transaction_data().log_index.into(),
                 })),
                 created_at_time: None,
+                fee: None,
             })
             .call_ckerc20_ledger_get_transaction(params.token().ledger_canister_id, 0_u8)
             .expect_mint(Mint {
@@ -1465,6 +1472,7 @@ fn should_deposit_cketh_and_ckerc20() {
                     log_index: params.transaction_data().log_index.into(),
                 })),
                 created_at_time: None,
+                fee: None,
             });
     }
 }

@@ -93,6 +93,7 @@ fn should_deposit_and_withdraw() {
                     log_index: DEFAULT_DEPOSIT_LOG_INDEX.into(),
                 })),
                 created_at_time: None,
+                fee: None,
             })
             .call_ledger_approve_minter(account.owner, EXPECTED_BALANCE, account.subaccount)
             .expect_ok(1)
@@ -124,6 +125,7 @@ fn should_deposit_and_withdraw() {
                     to_address: destination.parse().unwrap(),
                 })),
                 created_at_time: None,
+                fee: None,
             });
         assert_eq!(cketh.balance_of(account), Nat::from(0_u8));
 
@@ -454,6 +456,7 @@ fn should_reimburse() {
                 log_index: DEFAULT_DEPOSIT_LOG_INDEX.into(),
             })),
             created_at_time: None,
+            fee: None,
         })
         .call_ledger_approve_minter(caller, EXPECTED_BALANCE, None)
         .expect_ok(1);
@@ -493,6 +496,7 @@ fn should_reimburse() {
                 to_address: destination.parse().unwrap(),
             })),
             created_at_time: None,
+            fee: None,
         });
 
     assert_eq!(cketh.balance_of(caller), Nat::from(0_u8));
@@ -543,6 +547,7 @@ fn should_reimburse() {
                 tx_hash: failed_tx_hash.parse().unwrap(),
             })),
             created_at_time: None,
+            fee: None,
         })
         .assert_has_unique_events_in_order(&vec![
             EventPayload::AcceptedEthWithdrawalRequest {

@@ -18,7 +18,7 @@ use crate::archive::{ArchivingGuardError, FailedToArchiveBlocks, LedgerArchiving
 use ic_ledger_core::balances::{BalanceError, Balances, BalancesStore};
 use ic_ledger_core::block::{BlockIndex, BlockType, EncodedBlock, FeeCollector};
 use ic_ledger_core::timestamp::TimeStamp;
-use ic_ledger_core::tokens::TokensType;
+use ic_ledger_core::tokens::{TokensType, Zero};
 use ic_ledger_hash_of::HashOf;
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -34,6 +34,7 @@ pub enum TxApplyError<Tokens> {
     ExpiredApproval { now: TimeStamp },
     AllowanceChanged { current_allowance: Tokens },
     SelfApproval,
+    BurnOrMintFee,
 }
 
 impl<Tokens> From<BalanceError<Tokens>> for TxApplyError<Tokens> {
@@ -264,6 +265,9 @@ where
                 TransferError::AllowanceChanged { current_allowance }
             }
             TxApplyError::SelfApproval => TransferError::SelfApproval,
+            TxApplyError::BurnOrMintFee => TransferError::BadFee {
+                expected_fee: L::Tokens::zero(),
+            },
         })?;
 
     let fee_collector = ledger.fee_collector().cloned();

@@ -462,6 +462,14 @@ fn test_mint_burn() {
     ic_ledger_suite_state_machine_tests::test_mint_burn(ledger_wasm(), encode_init_args);
 }
 
+#[test]
+fn test_mint_burn_fee_rejected() {
+    ic_ledger_suite_state_machine_tests::test_mint_burn_fee_rejected(
+        ledger_wasm(),
+        encode_init_args,
+    );
+}
+
 #[test]
 fn test_anonymous_transfers() {
     ic_ledger_suite_state_machine_tests::test_anonymous_transfers(ledger_wasm(), encode_init_args);

@@ -26,14 +26,16 @@ type Burn = record {
   memo : opt vec nat8;
   created_at_time : opt nat64;
   amount : nat;
-  spender : opt Account
+  spender : opt Account;
+  fee : opt nat
 };
 
 type Mint = record {
   to : Account;
   memo : opt vec nat8;
   created_at_time : opt nat64;
-  amount : nat
+  amount : nat;
+  fee : opt nat
 };
 
 type Transfer = record {

@@ -128,6 +128,7 @@ fn test_icrc3_get_blocks() {
         Operation::Mint {
             to: Account::from(Principal::anonymous()),
             amount: Tokens::from(1_000_000_000u64),
+            fee: None,
         },
     );
     let blockid0 = block_with_id(0, block0.clone());
@@ -259,6 +260,7 @@ fn test_icrc3_get_blocks_number_of_blocks_limit() {
                 operation: Operation::Mint {
                     to: Account::from(Principal::anonymous()),
                     amount: Tokens::from(amount as u64),
+                    fee: None,
                 },
                 created_at_time: None,
                 memo: None,

@@ -76,14 +76,16 @@ type Burn = record {
   memo : opt vec nat8;
   created_at_time : opt nat64;
   amount : Tokens;
-  spender : opt Account
+  spender : opt Account;
+  fee : opt nat
 };
 
 type Mint = record {
   to : Account;
   memo : opt vec nat8;
   created_at_time : opt nat64;
-  amount : Tokens
+  amount : Tokens;
+  fee : opt nat
 };
 
 type Transfer = record {
@@ -134,7 +136,15 @@ type ListSubaccountsArgs = record {
 };
 
 type Status = record {
-  num_blocks_synced : BlockIndex
+  num_blocks_synced : BlockIndex;
+  sync_status : SyncStatus
+};
+
+type SyncStatus = variant {
+  Syncing;
+  NotSyncing : record {
+    error_msg : text
+  }  
 };
 
 type FeeCollectorRanges = record {
@@ -148,5 +158,5 @@ service : (index_arg : opt IndexArg) -> {
   icrc1_balance_of : (Account) -> (Tokens) query;
   ledger_id : () -> (principal) query;
   list_subaccounts : (ListSubaccountsArgs) -> (vec SubAccount) query;
-  status : () -> (Status) query
+  status : () -> (Status) query;
 }
diff --git a/rs/ledger_suite/icrc1/index-ng/src/lib.rs b/rs/ledger_suite/icrc1/index-ng/src/lib.rs
@@ -81,6 +81,18 @@ pub struct ListSubaccountsArgs {
 #[derive(Eq, PartialEq, Debug, CandidType, Deserialize)]
 pub struct Status {
     pub num_blocks_synced: BlockIndex,
+    pub sync_status: SyncStatus,
+}
+
+#[derive(Eq, PartialEq, Debug, CandidType, Deserialize)]
+pub struct SyncError {
+    pub error_msg: String,
+}
+
+#[derive(Eq, PartialEq, Debug, CandidType, Deserialize)]
+pub enum SyncStatus {
+    Syncing,
+    NotSyncing(SyncError),
 }
 
 #[derive(Eq, PartialEq, Debug, CandidType, Deserialize)]