From 5f7edfe0d70439534bf2ccde22992529adb89442 Mon Sep 17 00:00:00 2001
From: Amber <amber@fleek.co>
Date: Thu, 25 Nov 2021 02:54:19 -0600
Subject: [PATCH 1/3] Add delegation for query

---
 sdk/core/src/bucket.rs       |  2 +-
 sdk/core/src/root.rs         |  2 +-
 sdk/src/transaction/query.rs | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sdk/core/src/bucket.rs b/sdk/core/src/bucket.rs
index 40adbbf..b7cba77 100644
--- a/sdk/core/src/bucket.rs
+++ b/sdk/core/src/bucket.rs
@@ -13,7 +13,7 @@ use cap_common::{
 /// contract is created using multiple bucket canisters, which are interconnected using a root bucket
 /// and router system. Querying buckets also features pagination.
 #[derive(Copy, Clone)]
-pub struct Bucket(pub(crate) Principal);
+pub struct Bucket(pub Principal);
 
 impl Bucket {
     /// Returns the list of canisters which have different pages of data.
diff --git a/sdk/core/src/root.rs b/sdk/core/src/root.rs
index b36075d..b60a713 100644
--- a/sdk/core/src/root.rs
+++ b/sdk/core/src/root.rs
@@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// Use [`RootBucket`]'s [`Into<Bucket>`] implementation to use a [`RootBucket`] as a [`Bucket`].
 #[derive(Copy, Clone, Serialize, Deserialize, CandidType)]
-pub struct RootBucket(pub(crate) Principal);
+pub struct RootBucket(pub Principal);
 
 impl RootBucket {
     /// Returns a bucket that be used to query for the given transaction ID.
diff --git a/sdk/src/transaction/query.rs b/sdk/src/transaction/query.rs
index b23a5da..ae9b9bc 100644
--- a/sdk/src/transaction/query.rs
+++ b/sdk/src/transaction/query.rs
@@ -1,4 +1,4 @@
-use cap_sdk_core::GetTransactionResponse;
+use cap_sdk_core::{Bucket, GetTransactionResponse};
 
 use crate::{CapEnv, GetTransactionError, Transaction, TransactionId};
 
@@ -28,11 +28,18 @@ pub async fn get_transaction(id: TransactionId) -> Result<Transaction, GetTransa
         .await
         .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
 
-    let transaction = bucket
+    let mut transaction = bucket
         .get_transaction(id)
         .await
         .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
 
+    while let GetTransactionResponse::Delegate(bucket, _) = transaction {
+        transaction = Bucket(bucket)
+            .get_transaction(id)
+            .await
+            .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
+    }
+
     if let GetTransactionResponse::Found(event, _) = transaction {
         if let Some(event) = event {
             Ok(event)
@@ -40,7 +47,6 @@ pub async fn get_transaction(id: TransactionId) -> Result<Transaction, GetTransa
             Err(GetTransactionError::InvalidId)
         }
     } else {
-        // TODO: Delegate
-        unimplemented!("This version of cap-sdk does not support multi-canister.")
+        Err(GetTransactionError::InvalidId)
     }
 }

From 4b8055085af5ef1974c88757b92e49772eff8b13 Mon Sep 17 00:00:00 2001
From: Amber <amber@fleek.co>
Date: Thu, 25 Nov 2021 07:04:18 -0600
Subject: [PATCH 2/3] Fix clippy lints

---
 canisters/sdk_example/src/lib.rs | 1 +
 sdk/src/transaction/query.rs     | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/canisters/sdk_example/src/lib.rs b/canisters/sdk_example/src/lib.rs
index 1fd88bd..1ebb170 100644
--- a/canisters/sdk_example/src/lib.rs
+++ b/canisters/sdk_example/src/lib.rs
@@ -19,6 +19,7 @@ struct Data {
 
 /// The default implementation for the data store used to initialize
 /// the data.
+#[allow(clippy::derivable_impls)]
 impl Default for Data {
     fn default() -> Self {
         Self {
diff --git a/sdk/src/transaction/query.rs b/sdk/src/transaction/query.rs
index ae9b9bc..e72b472 100644
--- a/sdk/src/transaction/query.rs
+++ b/sdk/src/transaction/query.rs
@@ -40,12 +40,8 @@ pub async fn get_transaction(id: TransactionId) -> Result<Transaction, GetTransa
             .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
     }
 
-    if let GetTransactionResponse::Found(event, _) = transaction {
-        if let Some(event) = event {
-            Ok(event)
-        } else {
-            Err(GetTransactionError::InvalidId)
-        }
+    if let GetTransactionResponse::Found(Some(event), _) = transaction {
+        Ok(event)
     } else {
         Err(GetTransactionError::InvalidId)
     }

From 35e04375734e6bc1928256ac2e0e1973d774d33b Mon Sep 17 00:00:00 2001
From: Amber <amber@fleek.co>
Date: Thu, 25 Nov 2021 07:39:14 -0600
Subject: [PATCH 3/3] Fix clippy lints on stable

---
 canisters/sdk_example/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/canisters/sdk_example/src/lib.rs b/canisters/sdk_example/src/lib.rs
index 1ebb170..1fd88bd 100644
--- a/canisters/sdk_example/src/lib.rs
+++ b/canisters/sdk_example/src/lib.rs
@@ -19,7 +19,6 @@ struct Data {
 
 /// The default implementation for the data store used to initialize
 /// the data.
-#[allow(clippy::derivable_impls)]
 impl Default for Data {
     fn default() -> Self {
         Self {