Skip to content

MESH-2274\Remove CDD check for transferring #1822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Neopallium merged 1 commit into from
May 5, 2025
Merged

MESH-2274\Remove CDD check for transferring #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions pallets/balances/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ pub mod pallet {
let transactor = ensure_signed(origin)?;
let dest = T::Lookup::lookup(dest)?;
// Polymesh modified code. CDD is checked before processing transfer.
Self::safe_transfer_core(
Self::transfer_core(
&transactor,
&dest,
value,
Expand Down Expand Up @@ -508,7 +508,7 @@ pub mod pallet {
) -> DispatchResult {
let transactor = ensure_signed(origin)?;
let dest = T::Lookup::lookup(dest)?;
Self::safe_transfer_core(
Self::transfer_core(
&transactor,
&dest,
value,
Expand Down Expand Up @@ -832,23 +832,6 @@ impl<T: Config> Pallet<T> {
}
}

// Polymesh modified code. New wrapper function for the transfer_core function that checks for CDD.
/// Checks CDD and then only performs the transfer
fn safe_transfer_core(
transactor: &T::AccountId,
dest: &T::AccountId,
value: Balance,
memo: Option<Memo>,
existence_requirement: ExistenceRequirement,
) -> DispatchResult {
ensure!(
T::CddChecker::check_key_cdd(dest),
Error::<T>::ReceiverCddMissing
);

Self::transfer_core(transactor, dest, value, memo, existence_requirement)
}

/// Common functionality for transfers.
/// It does not emit any event.
///
Expand Down Expand Up @@ -1058,7 +1041,6 @@ impl<T: Config> Currency<T::AccountId> for Pallet<T> {
Ok(())
}

/// Important-Note - Use the transfer carefully as this function is not resilient for the cdd check of receiver.
/// Transfer some free balance from `transactor` to `dest`.
/// Is a no-op if value to be transferred is zero or the `transactor` is the same as `dest`.
fn transfer(
Expand All @@ -1067,7 +1049,7 @@ impl<T: Config> Currency<T::AccountId> for Pallet<T> {
value: Self::Balance,
existence_requirement: ExistenceRequirement,
) -> DispatchResult {
Self::safe_transfer_core(transactor, dest, value, None, existence_requirement)
Self::transfer_core(transactor, dest, value, None, existence_requirement)
}

/// Transfer some free balance from `transactor` to `dest`.
Expand Down
7 changes: 5 additions & 2 deletions pallets/runtime/tests/src/treasury_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,16 @@ fn reimbursement_and_disbursement_we() {
exec_ok!(Treasury::disbursement(root(), beneficiaries.clone()));

// Check balances after disbursement.
assert_eq!(Treasury::balance(), 400);
assert_eq!(Treasury::balance(), 300);
assert_eq!(
Balances::free_balance(&alice.acc()),
before_alice_balance + 100
);
assert_eq!(Balances::free_balance(&bob.acc()), before_bob_balance + 500);
assert_eq!(Balances::free_balance(&charlie_acc), before_charlie_balance);
assert_eq!(
Balances::free_balance(&charlie_acc),
before_charlie_balance + 100
);
assert_eq!(total_issuance, TotalIssuance::<TestStorage>::get());

// Alice cannot make a disbursement to herself.
Expand Down