Swap backend

src/canister/individual_user_template/can.did

@@ -16,11 +16,25 @@ type AirdropError = variant {
 type AirdropInfo = record {
   principals_who_successfully_claimed : vec record { principal; ClaimStatus };
 };
+
+type ApproveError = variant {
+  GenericError : record { message : text; error_code : nat };
+  TemporarilyUnavailable;
+  Duplicate : record { duplicate_of : nat };
+  BadFee : record { expected_fee : nat };
+  AllowanceChanged : record { current_allowance : nat };
+  CreatedInFuture : record { ledger_time : nat64 };
+  TooOld;
+  Expired : record { ledger_time : nat64 };
+  InsufficientFunds : record { balance : nat };
+};
+
 type BalanceInfo = record {
   balance : nat;
   withdrawable : nat;
   net_airdrop_reward : nat;
 };
+
 type BetDetails = record {
   bet_direction : BetDirection;
   bet_maker_canister_id : principal;
@@ -84,6 +98,7 @@ type DeployedCdaoCanisters = record {
   airdrop_info : AirdropInfo;
   root : principal;
   swap : principal;
+  last_swapped_price : opt float64;
   ledger : principal;
   index : principal;
   governance : principal;
@@ -402,13 +417,14 @@ type Result_24 = variant { Ok : text; Err : text };
 type Result_25 = variant { Ok : IndividualUserCreatorDaoEntry; Err : text };
 type Result_26 = variant { Committed : Committed; Aborted : record {} };
 type Result_27 = variant { Ok : Ok; Err : GovernanceError };
-type Result_28 = variant { Ok; Err : CdaoTokenError };
-type Result_29 = variant {
+type Result_28 = variant { Ok; Err : SwapError };
+type Result_29 = variant { Ok; Err : CdaoTokenError };
+type Result_3 = variant { Ok : bool; Err : CdaoTokenError };
+type Result_30 = variant {
   Ok : UserProfileDetailsForFrontend;
   Err : UpdateProfileDetailsError;
 };
-type Result_3 = variant { Ok : bool; Err : CdaoTokenError };
-type Result_30 = variant { Ok; Err : UpdateProfileSetUniqueUsernameError };
+type Result_31 = variant { Ok; Err : UpdateProfileSetUniqueUsernameError };
 type Result_4 = variant {
   Ok : BettingStatus;
   Err : BetOnCurrentlyViewingPostError;
@@ -486,6 +502,18 @@ type SwapDistribution = record {
   total_e8s : nat64;
   initial_swap_amount_e8s : nat64;
 };
+type SwapError = variant {
+  SwapAllocationExhausted;
+  ApproveError : ApproveError;
+  TransferFromError : TransferFromError;
+  CallError : record { RejectionCode; text };
+  IsNotTokenCreator;
+  NoController;
+  InvalidLedger;
+  UnsupportedToken;
+  Unauthenticated;
+};
+type SwapTokenData = record { amt : nat; ledger : principal };
 type SystemTime = record {
   nanos_since_epoch : nat32;
   secs_since_epoch : nat64;
@@ -514,6 +542,7 @@ type TokenEvent = variant {
     amount : nat64;
   };
 };
+type TokenPairs = record { token_a : SwapTokenData; token_b : SwapTokenData };
 type TransferError = variant {
   GenericError : record { message : text; error_code : nat };
   TemporarilyUnavailable;
@@ -524,6 +553,17 @@ type TransferError = variant {
   TooOld;
   InsufficientFunds : record { balance : nat };
 };
+type TransferFromError = variant {
+  GenericError : record { message : text; error_code : nat };
+  TemporarilyUnavailable;
+  InsufficientAllowance : record { allowance : nat };
+  BadBurn : record { min_burn_amount : nat };
+  Duplicate : record { duplicate_of : nat };
+  BadFee : record { expected_fee : nat };
+  CreatedInFuture : record { ledger_time : nat64 };
+  TooOld;
+  InsufficientFunds : record { balance : nat };
+};
 type TreasuryDistribution = record { total_e8s : nat64 };
 type UpdateProfileDetailsError = variant { NotAuthorized };
 type UpdateProfileSetUniqueUsernameError = variant {
@@ -671,23 +711,25 @@ service : (IndividualUserTemplateInitArgs) -> {
       SettleNeuronsFundParticipationRequest,
     ) -> (SettleNeuronsFundParticipationResponse);
   stake_dollr_for_gdollr : (nat) -> (Result_1);
+  swap_request_action : (TokenPairs, principal) -> (Result_28);
   transfer_token_to_user_canister : (principal, principal, opt blob, nat) -> (
-      Result_28,
+      Result_29,
     );
   transfer_tokens_and_posts : (principal, principal) -> (Result_22);
   update_last_access_time : () -> (Result_24);
   update_last_canister_functionality_access_time : () -> ();
+  update_last_swap_price : (principal, float64) -> ();
   update_ml_feed_cache : (vec MLFeedCacheItem) -> (Result_24);
   update_post_add_view_details : (nat64, PostViewDetailsFromFrontend) -> ();
   update_post_as_ready_to_view : (nat64) -> ();
   update_post_increment_share_count : (nat64) -> (nat64);
   update_post_status : (nat64, PostStatus) -> ();
   update_post_toggle_like_status_by_caller : (nat64) -> (bool);
   update_profile_display_details : (UserProfileUpdateDetailsFromFrontend) -> (
-      Result_29,
+      Result_30,
     );
   update_profile_owner : (opt principal) -> (Result_1);
-  update_profile_set_unique_username_once : (text) -> (Result_30);
+  update_profile_set_unique_username_once : (text) -> (Result_31);
   update_profiles_i_follow_toggle_list_with_specified_profile : (
       FolloweeArg,
     ) -> (Result_9);

src/canister/individual_user_template/src/api/cdao/mod.rs

@@ -1,4 +1,5 @@
 mod airdrop;
+pub mod swap;
 mod token;
 use std::collections::{HashMap, HashSet, VecDeque};
 
@@ -373,9 +374,8 @@ async fn deploy_cdao_sns(
         root: root.0,
         swap: swap.0,
         index: index.0,
-        airdrop_info: AirdropInfo {
-            principals_who_successfully_claimed: HashMap::new(),
-        },
+        airdrop_info: AirdropInfo { principals_who_successfully_claimed: HashMap::new() },
+        last_swapped_price: None,
     };
     CANISTER_DATA.with(|cdata| {
         let mut cdata = cdata.borrow_mut();

src/canister/individual_user_template/src/api/cdao/swap.rs

@@ -0,0 +1,55 @@
+use candid::{CandidType, Nat, Principal};
+use ic_cdk_macros::update;
+use icrc_ledger_types::icrc2::transfer_from::{TransferFromArgs, TransferFromError};
+use serde::Deserialize;
+use shared_utils::{canister_specific::individual_user_template::types::{cdao::TokenPairs, error::SwapError}, common::utils::permissions::is_caller_global_admin};
+use crate::util::guard::is_caller_profile_owner;
+use crate::{api::profile::get_profile_details_v2::get_profile_details_v2, CANISTER_DATA};
+
+#[derive(CandidType, Deserialize, PartialEq, Eq, Debug)]
+struct SupportedStandards{
+    name: String,
+    url: String
+}
+
+#[update(guard = "is_caller_profile_owner")]
+pub async fn swap_request_action(token_pairs: TokenPairs, requester: Principal) -> Result<(), SwapError>{
+    //auth
+    if ic_cdk::caller() != get_profile_details_v2().principal_id{
+        return Err(SwapError::Unauthenticated);
+    }
+    let TokenPairs{token_a, token_b} = token_pairs;
+
+    let transfer_res: (Result<Nat, TransferFromError>, ) = ic_cdk::call(token_a.ledger, "icrc2_transfer_from", (TransferFromArgs{
+        from: requester.into(),
+        spender_subaccount: None,
+        to: ic_cdk::caller().into(),
+        amount: token_a.amt,
+        fee: None,
+        memo: None,
+        created_at_time: None
+    }, )).await?;
+    transfer_res.0.map_err(SwapError::TransferFromError)?;
+
+    let transfer_res: (Result<Nat, TransferFromError>, ) = ic_cdk::call(token_b.ledger, "icrc2_transfer_from", (TransferFromArgs{
+        from: ic_cdk::caller().into(),
+        spender_subaccount: None,
+        to: requester.into(),
+        amount: token_b.amt,
+        fee: None,
+        memo: None,
+        created_at_time: None
+    }, )).await?;
+    transfer_res.0.map_err(SwapError::TransferFromError)?;
+
+    Ok(())
+}
+
+#[update(guard = "is_caller_global_admin")]
+fn update_last_swap_price(token_ledger: Principal, price: f64){
+    CANISTER_DATA.with_borrow_mut(|data| {
+        if let Some(cdao) = data.cdao_canisters.iter_mut().find(|cdao| cdao.ledger == token_ledger){
+            cdao.last_swapped_price = Some(price);
+        }
+    });
+}

src/canister/individual_user_template/src/api/mod.rs

@@ -14,4 +14,4 @@ pub mod token;
 pub mod well_known_principal;
 pub mod cdao;
 pub mod device_id_management;
-pub mod pump_n_dump;
+pub mod pump_n_dump;

src/canister/individual_user_template/src/api/profile/get_profile_details_v2.rs

@@ -3,7 +3,7 @@ use ic_cdk_macros::query;
 use shared_utils::canister_specific::individual_user_template::types::profile::UserProfileDetailsForFrontendV2;
 
 #[query]
-fn get_profile_details_v2() -> UserProfileDetailsForFrontendV2 {
+pub fn get_profile_details_v2() -> UserProfileDetailsForFrontendV2 {
     CANISTER_DATA.with_borrow(|canister_data_ref_cell| {
         let profile = canister_data_ref_cell.profile.clone();
         let token_balance = &canister_data_ref_cell.my_token_balance;

src/canister/individual_user_template/src/lib.rs

@@ -18,11 +18,11 @@ use icrc_ledger_types::icrc1::transfer::Memo;
 use shared_utils::{
     canister_specific::individual_user_template::types::{
         arg::{FolloweeArg, IndividualUserTemplateInitArgs, PlaceBetArg},
-        cdao::DeployedCdaoCanisters,
+        cdao::{DeployedCdaoCanisters, TokenPairs},
         device_id::DeviceIdentity,
         error::{
-            AirdropError, BetOnCurrentlyViewingPostError, CdaoDeployError, CdaoTokenError,
-            FollowAnotherUserProfileError, GetPostsOfUserProfileError,
+            BetOnCurrentlyViewingPostError, CdaoDeployError, CdaoTokenError,
+            FollowAnotherUserProfileError, GetPostsOfUserProfileError, AirdropError, SwapError
         },
         follow::{FollowEntryDetail, FollowEntryId},
         hot_or_not::{BetDetails, BetOutcomeForBetMaker, BettingStatus, PlacedBetDetail},
@@ -60,6 +60,7 @@ pub mod data_model;
 mod util;
 
 thread_local! {
+
     static CANISTER_DATA: RefCell<CanisterData> = RefCell::default();
     static SNAPSHOT_DATA: RefCell<Vec<u8>> = RefCell::default();
     static PUMP_N_DUMP: RefCell<PumpAndDumpGame> = RefCell::default();

src/canister/individual_user_template/src/util/guard.rs

@@ -0,0 +1,9 @@
+use crate::api::profile::get_profile_details_v2::get_profile_details_v2;
+
+pub fn is_caller_profile_owner() -> Result<(), String> {
+
+    if ic_cdk::caller() != get_profile_details_v2().principal_id{
+        return Err("Unauthorize".to_string());
+    }
+    Ok(())
+}

src/canister/individual_user_template/src/util/mod.rs

@@ -3,3 +3,4 @@ pub mod migration;
 pub mod periodic_update;
 pub mod score_ranking;
 pub mod subnet_orchestrator;
+pub mod guard;

src/canister/platform_orchestrator/src/guard/is_caller.rs

@@ -19,4 +19,4 @@ pub(crate) fn is_caller_global_admin_or_controller() -> Result<(), String> {
             false => Err("Unauthorized".into()),
         }
     })
-}
+}

src/lib/integration_tests/tests/creator_dao/main.rs

@@ -3,45 +3,27 @@ pub mod test_deletion_of_creator_tokens;
 pub mod test_number_of_creator_tokens;
 pub mod types;
 pub mod utils;
+pub mod test_swap_flow;
 
 use ic_ledger_types::Memo;
 use ic_sns_governance::pb::v1::governance::Version;
-use ic_sns_governance::pb::v1::{
-    manage_neuron, neuron, Account, GetRunningSnsVersionRequest, GetRunningSnsVersionResponse,
-    ListNeurons, ListNeuronsResponse, ManageNeuron, ManageNeuronResponse,
-};
-use ic_sns_init::pb::v1::{
-    sns_init_payload::InitialTokenDistribution, AirdropDistribution, DeveloperDistribution,
-    FractionalDeveloperVotingPower, NeuronDistribution, SnsInitPayload, SwapDistribution,
-    TreasuryDistribution,
-};
-use ic_sns_swap::pb::v1::{
-    GetInitRequest, GetInitResponse, NeuronBasketConstructionParameters, NewSaleTicketRequest,
-    NewSaleTicketResponse, RefreshBuyerTokensRequest, RefreshBuyerTokensResponse,
-};
+use ic_sns_governance::pb::v1::{GetRunningSnsVersionRequest, GetRunningSnsVersionResponse};
 use sha2::{Digest, Sha256};
-use shared_utils::canister_specific::individual_user_template::types::arg::IndividualUserTemplateInitArgs;
 use shared_utils::canister_specific::individual_user_template::types::error::AirdropError;
+use test_utils::setup::test_constants::get_mock_user_bob_principal_id;
 use shared_utils::constant::{
-    SNS_TOKEN_ARCHIVE_MODULE_HASH, SNS_TOKEN_GOVERNANCE_MODULE_HASH, SNS_TOKEN_INDEX_MODULE_HASH,
-    SNS_TOKEN_LEDGER_MODULE_HASH, SNS_TOKEN_ROOT_MODULE_HASH, SNS_TOKEN_SWAP_MODULE_HASH,
+    SNS_TOKEN_ARCHIVE_MODULE_HASH, SNS_TOKEN_GOVERNANCE_MODULE_HASH, SNS_TOKEN_INDEX_MODULE_HASH, SNS_TOKEN_LEDGER_MODULE_HASH, SNS_TOKEN_ROOT_MODULE_HASH, SNS_TOKEN_SWAP_MODULE_HASH
 };
 use shared_utils::types::creator_dao_stats::CreatorDaoTokenStats;
-use std::time::{Duration, UNIX_EPOCH};
-use std::{collections::HashMap, fmt::Debug, str::FromStr, time::SystemTime, vec};
-use test_utils::setup::test_constants::get_mock_user_bob_principal_id;
+use std::{collections::HashMap, fmt::Debug, vec};
 use utils::{setup_default_sns_creator_token, setup_sns_w_canister_for_creator_dao};
 
 use candid::{encode_args, CandidType, Decode, Encode, Nat, Principal};
-use ic_base_types::PrincipalId;
-use ic_sns_wasm::init::SnsWasmCanisterInitPayload;
-use icp_ledger::Subaccount;
 use pocket_ic::WasmResult;
 use serde::{Deserialize, Serialize};
 use shared_utils::{
-    canister_specific::individual_user_template::{
-        types::cdao::DeployedCdaoCanisters, types::error::CdaoDeployError,
-    },
+    canister_specific::individual_user_template::
+        types::cdao::DeployedCdaoCanisters,
     common::types::known_principal::KnownPrincipalType,
     constant::SNS_WASM_W_PRINCIPAL_ID,
 };