Skip to content
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

added decimal handling for airdrop #446

Merged
merged 9 commits into from
Nov 11, 2024
Merged

added decimal handling for airdrop #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cc25189
added decimal handling for airdrop
Nov 4, 2024
7e65b2a
fix test
Nov 4, 2024
48849ce
fix
Nov 4, 2024
d8e125c
ListSnsCanistersResponse
Nov 4, 2024
fcb5187
fix
Nov 4, 2024
082d649
u32 -> u64
Nov 5, 2024
98ef7bb
fixed overflow
Nov 5, 2024
6ef9f15
hardcoded decimals
Nov 5, 2024
2b9b2fb
Merge branch 'main' of https://github.com/yral-dapp/hot-or-not-backen…
Nov 11, 2024
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
4 changes: 2 additions & 2 deletions src/canister/individual_user_template/src/api/cdao/airdrop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ async fn request_airdrop(token_root: Principal, memo: Option<Memo>, amount: Nat,
return Err(AirdropError::AlreadyClaimedAirdrop);
}

let amount = amount.min(1000u32.into());
if amount < 100u32 {
let amount = amount.min(100_000_000_000u64.into()); // 1000 * 10^8
if amount < 10_000_000_000u64 { // 100 * 10^8
return Err(AirdropError::RequestedAmountTooLow)
}

Expand Down
98 changes: 43 additions & 55 deletions src/lib/integration_tests/tests/creator_dao/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ fn creator_dao_tests() {
controller: Some(
PrincipalId::from_str(&alice_principal.to_string()).unwrap(),
),
stake_e8s: 4_400_000,
stake_e8s: 60_000_000_000,
memo: 0,
dissolve_delay_seconds: 0,
vesting_period_seconds: None,
Expand All @@ -434,7 +434,7 @@ fn creator_dao_tests() {
total_e8s: 10_000_000,
}),
swap_distribution: Some(SwapDistribution {
total_e8s: 5_000_000,
total_e8s: 65_000_000_000,
initial_swap_amount_e8s: 5_000_000,
}),
},
Expand Down Expand Up @@ -728,7 +728,7 @@ fn creator_dao_tests() {
.unwrap();
ic_cdk::println!("🧪 SNS token Balance of alice: {:?}", res);

let expected_balance = Nat::from(4_400_000 - tx_fee);
let expected_balance = Nat::from(60_000_000_000 - tx_fee);
ic_cdk::println!("🧪 Expected Balance: {:?}", expected_balance);

let alice_canister_final_cycle_balance = pocket_ic.cycle_balance(alice_canister_id);
Expand Down Expand Up @@ -808,7 +808,6 @@ fn creator_dao_tests() {
Some(deployed_sns_version)
);
//Upgrade Governance Canister and check the running version

let bob = get_mock_user_bob_principal_id();
let bob_canister_id: Principal = pocket_ic
.update_call(
Expand All @@ -828,6 +827,14 @@ fn creator_dao_tests() {
.unwrap();

// simulating off-chain allocation (kinda)
let decimals = pocket_ic.query_call(ledger_canister, alice_canister_id, "icrc1_decimals", Encode!(&()).unwrap()).map(|res|{
let response: u8 = match res {
WasmResult::Reply(payload) => Decode!(&payload, u8).unwrap(),
_ => panic!("\n🛑 icrc1_transfer failed with: {:?}", res),
};
response
}).unwrap();

let transfer_args = types::TransferArg {
from_subaccount: None,
to: types::Account {
Expand All @@ -837,7 +844,7 @@ fn creator_dao_tests() {
fee: None,
created_at_time: None,
memo: None,
amount: 200u32.into(),
amount: Nat::from(200u32) * 10u64.pow(decimals.into()),
};
let transfer = pocket_ic
.update_call(
Expand All @@ -860,17 +867,10 @@ fn creator_dao_tests() {
let res = pocket_ic
.update_call(
alice_canister_id,
bob,
"request_airdrop",
encode_args((
root_canister,
None::<Memo>,
Nat::from(100u64),
bob_canister_id,
))
.unwrap(),
)
.map(|reply_payload| {
bob,
"request_airdrop",
encode_args((root_canister, None::<Memo>, Nat::from(100u64) * 10u64.pow(decimals.into()), bob_canister_id)).unwrap())
.map(|reply_payload|{
let response: Result<(), AirdropError> = match reply_payload {
WasmResult::Reply(payload) => Decode!(&payload, Result<(), AirdropError>).unwrap(),
_ => panic!("\n🛑 get requester principals canister id failed\n"),
Expand All @@ -882,51 +882,39 @@ fn creator_dao_tests() {

// trying to claim the airdrop again
let res: Result<Result<(), AirdropError>, pocket_ic::UserError> = pocket_ic
.update_call(
alice_canister_id,
bob,
"request_airdrop",
encode_args((
root_canister,
None::<Memo>,
Nat::from(100u64),
bob_canister_id,
))
.unwrap(),
)
.map(|reply_payload| {
let response: Result<(), AirdropError> = match reply_payload {
WasmResult::Reply(payload) => Decode!(&payload, Result<(), AirdropError>).unwrap(),
_ => panic!("\n🛑 get requester principals canister id failed\n"),
};
response
});
.update_call(
alice_canister_id,
bob,
"request_airdrop",
encode_args((root_canister, None::<Memo>, Nat::from(100u64) * 10u64.pow(decimals.into()), bob_canister_id)).unwrap())
.map(|reply_payload|{
let response: Result<(), AirdropError> = match reply_payload {
WasmResult::Reply(payload) => Decode!(&payload, Result<(), AirdropError>).unwrap(),
_ => panic!("\n🛑 get requester principals canister id failed\n"),
};
response
});

ic_cdk::println!("🧪 Result: {:?}", res);
assert!(
res.as_ref().unwrap().is_err() && res.unwrap() == Err(AirdropError::AlreadyClaimedAirdrop)
);

// trying to claim the airdrop with the wrong canister id
let res: Result<Result<(), AirdropError>, pocket_ic::UserError> = pocket_ic
.update_call(
alice_canister_id,
bob,
"request_airdrop",
encode_args((
root_canister,
None::<Memo>,
Nat::from(100u64),
Principal::anonymous(),
))
.unwrap(),
)
.map(|reply_payload| {
let response: Result<(), AirdropError> = match reply_payload {
WasmResult::Reply(payload) => Decode!(&payload, Result<(), AirdropError>).unwrap(),
_ => panic!("\n🛑 get requester principals canister id failed\n"),
};
response
});
.update_call(
alice_canister_id,
bob,
"request_airdrop",
encode_args((root_canister, None::<Memo>, Nat::from(100u64) * 10u64.pow(decimals.into()), Principal::anonymous())).unwrap())
.map(|reply_payload|{
let response: Result<(), AirdropError> = match reply_payload {
WasmResult::Reply(payload) => Decode!(&payload, Result<(), AirdropError>).unwrap(),
_ => panic!("\n🛑 get requester principals canister id failed\n"),
};
response
});

ic_cdk::println!("🧪 Result: {:?}", res);
assert!(res.unwrap().is_err());

Expand Down Expand Up @@ -987,5 +975,5 @@ fn creator_dao_tests() {
.unwrap();
ic_cdk::println!("🧪 SNS token Balance of alice canister: {:?}", alice_bal);

assert!(bob_bal == 100u64);
assert!(bob_bal == Nat::from(100u64) * 10u64.pow(decimals.into()));
}