From b075ab006108493499b712afa3b33d8a28941e39 Mon Sep 17 00:00:00 2001
From: Austin Kline <austindavidkline@gmail.com>
Date: Wed, 3 Apr 2024 08:59:07 -0700
Subject: [PATCH] fix access level for burn callback

---
 contracts/HybridCustody.cdc | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/contracts/HybridCustody.cdc b/contracts/HybridCustody.cdc
index a8ed0e4..ef7f127 100644
--- a/contracts/HybridCustody.cdc
+++ b/contracts/HybridCustody.cdc
@@ -499,12 +499,21 @@ access(all) contract HybridCustody {
             self.resources <- {}
         }
 
-        access(all) fun burnCallback() {
+        access(contract) fun burnCallback() {
+            pre {
+                // Prevent accidental burning of a resource that has ownership of other accounts
+                self.ownedAccounts.length == 0: "cannot destroy a manager with owned accounts"
+            }
+
             let keys = self.resources.keys
             for k in keys {
                 let r <- self.resources.remove(key: k)!
                 Burner.burn(<-r)
             }
+
+            for c in self.childAccounts.keys {
+                self.removeChild(addr: c)
+            }
         }
     }
 
@@ -969,14 +978,14 @@ access(all) contract HybridCustody {
             for c in childAccountControllers {
                 c.delete()
             }
-            destroy <- acct.storage.load<@AnyResource>(from: storagePath)
+            Burner.burn(<- acct.storage.load<@AnyResource>(from: storagePath))
 
             let delegatorStoragePath = StoragePath(identifier: capDelegatorIdentifier)!
             let delegatorControllers = acct.capabilities.storage.getControllers(forPath: delegatorStoragePath)
             for c in delegatorControllers {
                 c.delete()
             }
-            destroy <- acct.storage.load<@AnyResource>(from: delegatorStoragePath)
+            Burner.burn(<- acct.storage.load<@AnyResource>(from: delegatorStoragePath))
 
             self.parents.remove(key: parent)
             emit AccountUpdated(id: self.uuid, child: self.acct.address, parent: parent, active: false)
@@ -1196,11 +1205,15 @@ access(all) contract HybridCustody {
             self.display = nil
         }
 
-        access(all) fun burnCallback() {
+        access(contract) fun burnCallback() {
             for k in self.resources.keys {
                 let r <- self.resources.remove(key: k)!
                 Burner.burn(<-r)
             }
+
+            for p in self.parents.keys {
+                self.removeParent(parent: p)
+            }
         }
     }