Add support for P2P trades

Cargo.toml

@@ -19,6 +19,7 @@ members = [
     "backend/canisters/cycles_dispenser/api",
     "backend/canisters/cycles_dispenser/impl",
     "backend/canisters/escrow/api",
+    "backend/canisters/escrow/c2c_client",
     "backend/canisters/escrow/impl",
     "backend/canisters/group/api",
     "backend/canisters/group/c2c_client",

backend/canister_installer/src/lib.rs

@@ -64,6 +64,7 @@ async fn install_service_canisters_impl(
         proposals_bot_canister_id: canister_ids.proposals_bot,
         storage_index_canister_id: canister_ids.storage_index,
         cycles_dispenser_canister_id: canister_ids.cycles_dispenser,
+        escrow_canister_id: canister_ids.escrow,
         nns_governance_canister_id: canister_ids.nns_governance,
         internet_identity_canister_id: canister_ids.nns_internet_identity,
         wasm_version: version,
@@ -79,6 +80,7 @@ async fn install_service_canisters_impl(
         user_index_canister_id: canister_ids.user_index,
         cycles_dispenser_canister_id: canister_ids.cycles_dispenser,
         proposals_bot_user_id: canister_ids.proposals_bot.into(),
+        escrow_canister_id: canister_ids.escrow,
         wasm_version: version,
         test_mode,
     };

backend/canisters/community/CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 
 - Support getting batches of summary updates via LocalUserIndex ([#4983](https://github.com/open-chat-labs/open-chat/pull/4983))
+- Add support for P2P trades ([#4897](https://github.com/open-chat-labs/open-chat/pull/4897))
 
 ### Changed
 

backend/canisters/community/api/can.did

@@ -277,6 +277,28 @@ type ThreadPreviewsResponse = variant {
     ReplicaNotUpToDate : TimestampMillis;
 };
 
+type AcceptP2PTradeOfferArgs = record {
+    channel_id : ChannelId;
+    thread_root_message_index : opt MessageIndex;
+    message_index : MessageIndex;
+};
+
+type AcceptP2PTradeOfferResponse = variant {
+    Success;
+    InsufficientFunds;
+    AlreadyAccepted;
+    AlreadyCompleted;
+    OfferExpired;
+    OfferCancelled;
+    OfferNotFound;
+    ChannelNotFound;
+    UserNotInCommunity;
+    UserNotInChannel;
+    UserSuspended;
+    ChatFrozen;
+    InternalError : text;
+};
+
 type AddMembersToChannelArgs = record {
     channel_id : ChannelId;
     user_ids : vec UserId;
@@ -963,6 +985,7 @@ service : {
     summary_updates : (SummaryUpdatesArgs) -> (SummaryUpdatesResponse) query;
     thread_previews : (ThreadPreviewsArgs) -> (ThreadPreviewsResponse) query;
 
+    accept_p2p_trade_offer : (AcceptP2PTradeOfferArgs) -> (AcceptP2PTradeOfferResponse);
     add_members_to_channel : (AddMembersToChannelArgs) -> (AddMembersToChannelResponse);
     add_reaction : (AddReactionArgs) -> (AddReactionResponse);
     block_user : (BlockUserArgs) -> (BlockUserResponse);

backend/canisters/community/api/src/lifecycle/init.rs

@@ -21,6 +21,7 @@ pub struct Args {
     pub local_group_index_canister_id: CanisterId,
     pub notifications_canister_id: CanisterId,
     pub proposals_bot_user_id: UserId,
+    pub escrow_canister_id: CanisterId,
     pub gate: Option<AccessGate>,
     pub default_channels: Vec<String>,
     pub default_channel_rules: Option<Rules>,

backend/canisters/community/api/src/main.rs

@@ -22,6 +22,7 @@ fn main() {
     generate_candid_method!(community, summary_updates, query);
     generate_candid_method!(community, thread_previews, query);
 
+    generate_candid_method!(community, accept_p2p_trade_offer, update);
     generate_candid_method!(community, add_members_to_channel, update);
     generate_candid_method!(community, add_reaction, update);
     generate_candid_method!(community, block_user, update);

backend/canisters/community/api/src/updates/accept_p2p_trade_offer.rs

@@ -0,0 +1,27 @@
+use candid::CandidType;
+use serde::{Deserialize, Serialize};
+use types::{ChannelId, MessageIndex};
+
+#[derive(CandidType, Serialize, Deserialize, Debug)]
+pub struct Args {
+    pub channel_id: ChannelId,
+    pub thread_root_message_index: Option<MessageIndex>,
+    pub message_index: MessageIndex,
+}
+
+#[derive(CandidType, Serialize, Deserialize, Debug)]
+pub enum Response {
+    Success,
+    InsufficientFunds,
+    AlreadyAccepted,
+    AlreadyCompleted,
+    OfferExpired,
+    OfferCancelled,
+    OfferNotFound,
+    ChannelNotFound,
+    UserNotInCommunity,
+    UserNotInChannel,
+    UserSuspended,
+    ChatFrozen,
+    InternalError(String),
+}

backend/canisters/community/api/src/updates/mod.rs

@@ -1,3 +1,4 @@
+pub mod accept_p2p_trade_offer;
 pub mod add_members_to_channel;
 pub mod add_reaction;
 pub mod block_user;

backend/canisters/community/impl/Cargo.toml

@@ -19,6 +19,8 @@ canister_timer_jobs = { path = "../../../libraries/canister_timer_jobs" }
 canister_tracing_macros = { path = "../../../libraries/canister_tracing_macros" }
 chat_events = { path = "../../../libraries/chat_events" }
 community_canister = { path = "../api" }
+escrow_canister = { path = "../../escrow/api" }
+escrow_canister_c2c_client = { path = "../../escrow/c2c_client" }
 fire_and_forget_handler = { path = "../../../libraries/fire_and_forget_handler" }
 futures = { workspace = true }
 gated_groups = { path = "../../../libraries/gated_groups" }

backend/canisters/community/impl/src/lib.rs

@@ -246,6 +246,7 @@ impl RuntimeState {
                 local_group_index: self.data.local_group_index_canister_id,
                 notifications: self.data.notifications_canister_id,
                 proposals_bot: self.data.proposals_bot_user_id.into(),
+                escrow: self.data.escrow_canister_id,
                 icp_ledger: Cryptocurrency::InternetComputer.ledger_canister_id().unwrap(),
             },
         }
@@ -273,6 +274,8 @@ struct Data {
     local_group_index_canister_id: CanisterId,
     notifications_canister_id: CanisterId,
     proposals_bot_user_id: UserId,
+    #[serde(default = "escrow_canister_id")]
+    escrow_canister_id: CanisterId,
     date_created: TimestampMillis,
     members: CommunityMembers,
     channels: Channels,
@@ -295,6 +298,10 @@ struct Data {
     pub total_payment_receipts: PaymentReceipts,
 }
 
+fn escrow_canister_id() -> CanisterId {
+    CanisterId::from_text("s4yi7-yiaaa-aaaar-qacpq-cai").unwrap()
+}
+
 impl Data {
     #[allow(clippy::too_many_arguments)]
     fn new(
@@ -314,6 +321,7 @@ impl Data {
         local_group_index_canister_id: CanisterId,
         notifications_canister_id: CanisterId,
         proposals_bot_user_id: UserId,
+        escrow_canister_id: CanisterId,
         gate: Option<AccessGate>,
         default_channels: Vec<(ChannelId, String)>,
         default_channel_rules: Option<Rules>,
@@ -341,6 +349,7 @@ impl Data {
             local_group_index_canister_id,
             notifications_canister_id,
             proposals_bot_user_id,
+            escrow_canister_id,
             date_created: now,
             members,
             channels,
@@ -469,5 +478,6 @@ pub struct CanisterIds {
     pub local_group_index: CanisterId,
     pub notifications: CanisterId,
     pub proposals_bot: CanisterId,
+    pub escrow: CanisterId,
     pub icp_ledger: CanisterId,
 }

backend/canisters/community/impl/src/lifecycle/init.rs

@@ -38,6 +38,7 @@ fn init(args: Args) {
         args.local_group_index_canister_id,
         args.notifications_canister_id,
         args.proposals_bot_user_id,
+        args.escrow_canister_id,
         args.gate,
         default_channels,
         args.default_channel_rules,

backend/canisters/community/impl/src/timer_job_types.rs

@@ -6,9 +6,9 @@ use chat_events::MessageContentInternal;
 use ledger_utils::process_transaction;
 use serde::{Deserialize, Serialize};
 use tracing::error;
-use types::{BlobReference, CanisterId, ChannelId, ChatId, MessageId, MessageIndex, PendingCryptoTransaction};
+use types::{BlobReference, CanisterId, ChannelId, ChatId, MessageId, MessageIndex, PendingCryptoTransaction, UserId};
 use utils::consts::MEMO_PRIZE_REFUND;
-use utils::time::MINUTE_IN_MS;
+use utils::time::{MINUTE_IN_MS, SECOND_IN_MS};
 
 #[derive(Serialize, Deserialize, Clone)]
 pub enum TimerJob {
@@ -21,6 +21,7 @@ pub enum TimerJob {
     MarkGroupImportComplete(MarkGroupImportCompleteJob),
     RefundPrize(RefundPrizeJob),
     MakeTransfer(MakeTransferJob),
+    NotifyEscrowCanisterOfDeposit(NotifyEscrowCanisterOfDepositJob),
 }
 
 #[derive(Serialize, Deserialize, Clone)]
@@ -75,6 +76,39 @@ pub struct MakeTransferJob {
     pub pending_transaction: PendingCryptoTransaction,
 }
 
+#[derive(Serialize, Deserialize, Clone)]
+pub struct NotifyEscrowCanisterOfDepositJob {
+    pub user_id: UserId,
+    pub offer_id: u32,
+    pub channel_id: ChannelId,
+    pub thread_root_message_index: Option<MessageIndex>,
+    pub message_index: MessageIndex,
+    pub transaction_index: u64,
+    pub attempt: u32,
+}
+
+impl NotifyEscrowCanisterOfDepositJob {
+    pub fn run(
+        user_id: UserId,
+        offer_id: u32,
+        channel_id: ChannelId,
+        thread_root_message_index: Option<MessageIndex>,
+        message_index: MessageIndex,
+        transaction_index: u64,
+    ) {
+        let job = NotifyEscrowCanisterOfDepositJob {
+            user_id,
+            offer_id,
+            channel_id,
+            thread_root_message_index,
+            message_index,
+            transaction_index,
+            attempt: 0,
+        };
+        job.execute();
+    }
+}
+
 impl Job for TimerJob {
     fn execute(self) {
         match self {
@@ -87,6 +121,7 @@ impl Job for TimerJob {
             TimerJob::MarkGroupImportComplete(job) => job.execute(),
             TimerJob::RefundPrize(job) => job.execute(),
             TimerJob::MakeTransfer(job) => job.execute(),
+            TimerJob::NotifyEscrowCanisterOfDeposit(job) => job.execute(),
         }
     }
 }
@@ -239,3 +274,64 @@ impl Job for MakeTransferJob {
         }
     }
 }
+
+impl Job for NotifyEscrowCanisterOfDepositJob {
+    fn execute(self) {
+        let escrow_canister_id = read_state(|state| state.data.escrow_canister_id);
+
+        ic_cdk::spawn(async move {
+            match escrow_canister_c2c_client::notify_deposit(
+                escrow_canister_id,
+                &escrow_canister::notify_deposit::Args {
+                    offer_id: self.offer_id,
+                    user_id: Some(self.user_id),
+                },
+            )
+            .await
+            {
+                Ok(escrow_canister::notify_deposit::Response::Success(_)) => {
+                    mutate_state(|state| {
+                        if let Some(channel) = state.data.channels.get_mut(&self.channel_id) {
+                            channel.chat.events.complete_p2p_trade(
+                                self.user_id,
+                                self.thread_root_message_index,
+                                self.message_index,
+                                self.transaction_index,
+                                state.env.now(),
+                            );
+                        }
+                    });
+                }
+                Ok(escrow_canister::notify_deposit::Response::OfferExpired) => mutate_state(|state| {
+                    if let Some(channel) = state.data.channels.get_mut(&self.channel_id) {
+                        channel.chat.events.unreserve_p2p_trade(
+                            self.user_id,
+                            self.thread_root_message_index,
+                            self.message_index,
+                            state.env.now(),
+                        );
+                    }
+                }),
+                Ok(escrow_canister::notify_deposit::Response::InternalError(_)) | Err(_) if self.attempt < 20 => {
+                    mutate_state(|state| {
+                        let now = state.env.now();
+                        state.data.timer_jobs.enqueue_job(
+                            TimerJob::NotifyEscrowCanisterOfDeposit(NotifyEscrowCanisterOfDepositJob {
+                                offer_id: self.offer_id,
+                                user_id: self.user_id,
+                                channel_id: self.channel_id,
+                                thread_root_message_index: self.thread_root_message_index,
+                                message_index: self.message_index,
+                                transaction_index: self.transaction_index,
+                                attempt: self.attempt + 1,
+                            }),
+                            now + 10 * SECOND_IN_MS,
+                            now,
+                        );
+                    });
+                }
+                response => error!(?response, "Failed to notify escrow canister of deposit"),
+            };
+        })
+    }
+}