Merge remote-tracking branch 'origin/master' into swap

# Conflicts:
#	frontend/app/src/components/home/profile/Accounts.svelte

Cargo.toml

@@ -18,6 +18,8 @@ members = [
     "backend/canisters/community/impl",
     "backend/canisters/cycles_dispenser/api",
     "backend/canisters/cycles_dispenser/impl",
+    "backend/canisters/escrow/api",
+    "backend/canisters/escrow/impl",
     "backend/canisters/group/api",
     "backend/canisters/group/c2c_client",
     "backend/canisters/group/client",

backend/bots/examples/satoshi_dice/impl/src/jobs/process_pending_actions.rs

@@ -108,8 +108,8 @@ async fn process_action(action: Action) {
                                             token: Cryptocurrency::CKBTC,
                                             amount: amount as u128,
                                             fee: 10,
-                                            from: icrc1::CryptoAccount::Account(from),
-                                            to: icrc1::CryptoAccount::Account(Account::from(Principal::from(user_id))),
+                                            from: from.into(),
+                                            to: Account::from(Principal::from(user_id)).into(),
                                             memo: None,
                                             created: now_nanos,
                                             block_index: block_index.0.try_into().unwrap(),

backend/canister_installer/Cargo.toml

@@ -10,6 +10,7 @@ candid = { workspace = true }
 canister_agent_utils = { path = "../libraries/canister_agent_utils" }
 clap = { workspace = true, features = ["derive"] }
 cycles_dispenser_canister = { path = "../canisters/cycles_dispenser/api" }
+escrow_canister = { path = "../canisters/escrow/api" }
 futures = { workspace = true }
 group_index_canister = { path = "../canisters/group_index/api" }
 group_index_canister_client = { path = "../canisters/group_index/client" }

backend/canister_installer/src/lib.rs

@@ -32,6 +32,8 @@ async fn install_service_canisters_impl(
         set_controllers(management_canister, &canister_ids.cycles_dispenser, controllers.clone()),
         set_controllers(management_canister, &canister_ids.registry, controllers.clone()),
         set_controllers(management_canister, &canister_ids.market_maker, controllers.clone()),
+        set_controllers(management_canister, &canister_ids.neuron_controller, controllers.clone()),
+        set_controllers(management_canister, &canister_ids.escrow, controllers.clone()),
         set_controllers(
             management_canister,
             &canister_ids.local_user_index,
@@ -185,6 +187,13 @@ async fn install_service_canisters_impl(
         test_mode,
     };
 
+    let escrow_canister_wasm = get_canister_wasm(CanisterName::Escrow, version);
+    let escrow_init_args = escrow_canister::init::Args {
+        cycles_dispenser_canister_id: canister_ids.cycles_dispenser,
+        wasm_version: version,
+        test_mode,
+    };
+
     futures::future::join5(
         install_wasm(
             management_canister,
@@ -253,6 +262,14 @@ async fn install_service_canisters_impl(
     )
     .await;
 
+    install_wasm(
+        management_canister,
+        &canister_ids.escrow,
+        &escrow_canister_wasm.module,
+        escrow_init_args,
+    )
+    .await;
+
     let user_canister_wasm = get_canister_wasm(CanisterName::User, version);
     let group_canister_wasm = get_canister_wasm(CanisterName::Group, version);
     let community_canister_wasm = get_canister_wasm(CanisterName::Community, version);

backend/canister_installer/src/main.rs

@@ -21,6 +21,7 @@ async fn main() {
         registry: opts.registry,
         market_maker: opts.market_maker,
         neuron_controller: opts.neuron_controller,
+        escrow: opts.escrow,
         nns_root: opts.nns_root,
         nns_governance: opts.nns_governance,
         nns_internet_identity: opts.nns_internet_identity,
@@ -85,6 +86,9 @@ struct Opts {
     #[arg(long)]
     neuron_controller: CanisterId,
 
+    #[arg(long)]
+    escrow: CanisterId,
+
     #[arg(long)]
     nns_root: CanisterId,
 

backend/canister_upgrader/Cargo.toml

@@ -10,6 +10,7 @@ candid = { workspace = true }
 canister_agent_utils = { path = "../libraries/canister_agent_utils" }
 clap = { workspace = true, features = ["derive"] }
 cycles_dispenser_canister = { path = "../canisters/cycles_dispenser/api" }
+escrow_canister = { path = "../canisters/escrow/api" }
 group_index_canister = { path = "../canisters/group_index/api" }
 group_index_canister_client = { path = "../canisters/group_index/client" }
 ic-agent = { workspace = true }

backend/canister_upgrader/src/lib.rs

@@ -197,6 +197,25 @@ pub async fn upgrade_neuron_controller_canister(
     println!("Neuron controller canister upgraded");
 }
 
+pub async fn upgrade_escrow_canister(
+    identity: Box<dyn Identity>,
+    url: String,
+    escrow_canister_id: CanisterId,
+    version: BuildVersion,
+) {
+    upgrade_top_level_canister(
+        identity,
+        url,
+        escrow_canister_id,
+        version,
+        escrow_canister::post_upgrade::Args { wasm_version: version },
+        CanisterName::Escrow,
+    )
+    .await;
+
+    println!("Escrow canister upgraded");
+}
+
 pub async fn upgrade_local_group_index_canister(
     identity: Box<dyn Identity>,
     url: String,

backend/canister_upgrader/src/main.rs

@@ -14,6 +14,7 @@ async fn main() {
         CanisterName::CyclesDispenser => {
             upgrade_cycles_dispenser_canister(identity, opts.url, opts.cycles_dispenser, opts.version).await
         }
+        CanisterName::Escrow => upgrade_escrow_canister(identity, opts.url, opts.escrow, opts.version).await,
         CanisterName::Group => upgrade_group_canister(identity, opts.url, opts.group_index, opts.version).await,
         CanisterName::LocalGroupIndex => {
             upgrade_local_group_index_canister(identity, opts.url, opts.group_index, opts.version).await
@@ -86,6 +87,9 @@ struct Opts {
     #[arg(long)]
     neuron_controller: CanisterId,
 
+    #[arg(long)]
+    escrow: CanisterId,
+
     #[arg(long)]
     canister_to_upgrade: CanisterName,
 

backend/canisters/escrow/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [unreleased]
+
+### Added
+
+- Introduce the Escrow canister for supporting P2P trades ([#4903](https://github.com/open-chat-labs/open-chat/pull/4903))
+- Implement `create_offer` and `notify_deposit` ([#4904](https://github.com/open-chat-labs/open-chat/pull/4904)) 
+- Transfer out funds once trade is complete ([#4906](https://github.com/open-chat-labs/open-chat/pull/4906))
+- Implement `cancel_offer` ([#4907](https://github.com/open-chat-labs/open-chat/pull/4907))

backend/canisters/escrow/api/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "escrow_canister"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+candid = { workspace = true }
+candid_gen = { path = "../../../libraries/candid_gen" }
+icrc-ledger-types = { workspace = true }
+serde = { workspace = true }
+sha256 = { path = "../../../libraries/sha256" }
+types = { path = "../../../libraries/types" }

backend/canisters/escrow/api/can.did

@@ -0,0 +1,2 @@
+service : {
+}

backend/canisters/escrow/api/src/lib.rs

@@ -0,0 +1,19 @@
+use candid::Principal;
+use icrc_ledger_types::icrc1::account::Subaccount;
+use sha256::sha256;
+use types::UserId;
+
+mod lifecycle;
+mod queries;
+mod updates;
+
+pub use lifecycle::*;
+pub use queries::*;
+pub use updates::*;
+
+pub fn deposit_subaccount(user_id: UserId, offer_id: u32) -> Subaccount {
+    let mut bytes = Vec::new();
+    bytes.extend_from_slice(Principal::from(user_id).as_slice());
+    bytes.extend_from_slice(&offer_id.to_be_bytes());
+    sha256(&bytes)
+}

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

@@ -0,0 +1,10 @@
+use candid::CandidType;
+use serde::{Deserialize, Serialize};
+use types::{BuildVersion, CanisterId};
+
+#[derive(CandidType, Serialize, Deserialize, Debug)]
+pub struct Args {
+    pub cycles_dispenser_canister_id: CanisterId,
+    pub wasm_version: BuildVersion,
+    pub test_mode: bool,
+}

backend/canisters/escrow/api/src/lifecycle/mod.rs

@@ -0,0 +1,2 @@
+pub mod init;
+pub mod post_upgrade;

backend/canisters/escrow/api/src/lifecycle/post_upgrade.rs

@@ -0,0 +1,8 @@
+use candid::CandidType;
+use serde::{Deserialize, Serialize};
+use types::BuildVersion;
+
+#[derive(CandidType, Serialize, Deserialize, Debug)]
+pub struct Args {
+    pub wasm_version: BuildVersion,
+}

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

@@ -0,0 +1,5 @@
+#[allow(deprecated)]
+fn main() {
+    candid::export_service!();
+    std::print!("{}", __export_service());
+}

backend/canisters/escrow/api/src/queries/mod.rs

@@ -0,0 +1 @@
+

backend/canisters/escrow/api/src/updates/cancel_offer.rs

@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Args {
+    pub offer_id: u32,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum Response {
+    Success,
+    OfferAlreadyAccepted,
+    OfferExpired,
+    OfferNotFound,
+    NotAuthorized,
+}

backend/canisters/escrow/api/src/updates/create_offer.rs

@@ -0,0 +1,22 @@
+use serde::{Deserialize, Serialize};
+use types::{TimestampMillis, TokenInfo};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Args {
+    pub input_token: TokenInfo,
+    pub input_amount: u128,
+    pub output_token: TokenInfo,
+    pub output_amount: u128,
+    pub expires_at: TimestampMillis,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum Response {
+    Success(SuccessResult),
+    InvalidOffer(String),
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct SuccessResult {
+    pub id: u32,
+}

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

@@ -0,0 +1,3 @@
+pub mod cancel_offer;
+pub mod create_offer;
+pub mod notify_deposit;

backend/canisters/escrow/api/src/updates/notify_deposit.rs

@@ -0,0 +1,25 @@
+use serde::{Deserialize, Serialize};
+use types::UserId;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Args {
+    pub offer_id: u32,
+    pub user_id: Option<UserId>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum Response {
+    Success,
+    BalanceTooLow(BalanceTooLowResult),
+    OfferAlreadyAccepted,
+    OfferCancelled,
+    OfferExpired,
+    OfferNotFound,
+    InternalError(String),
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BalanceTooLowResult {
+    pub balance: u128,
+    pub balance_required: u128,
+}