tweak cap

Author: nialexsan

cadence/contracts/TidalYieldClosedBeta.cdc

@@ -18,29 +18,53 @@ access(all) contract TidalYieldClosedBeta {
     access(all) event BetaGranted(addr: Address, capID: UInt64)
     access(all) event BetaRevoked(addr: Address, capID: UInt64?)
 
+    /// Per-user badge storage path (under the *contract/deployer* account)
+    access(contract) fun _badgePath(_ addr: Address): StoragePath {
+        return StoragePath(identifier: "TY_BetaBadge_".concat(addr.toString()))!
+    }
+
+    /// Ensure the admin-owned badge exists for the user
+    access(contract) fun _ensureBadge(_ addr: Address) {
+        let p = self._badgePath(addr)
+        if self.account.storage.type(at: p) == nil {
+            self.account.storage.save(<-create BetaBadge(), to: p)
+        }
+    }
+
+    /// Issue a capability from the contract/deployer account and record its ID
+    access(contract) fun _issueBadgeCap(_ addr: Address): Capability<&{TidalYieldClosedBeta.IBeta}> {
+        let p = self._badgePath(addr)
+        let cap: Capability<&{TidalYieldClosedBeta.IBeta}> =
+            self.account.capabilities.storage.issue<&{TidalYieldClosedBeta.IBeta}>(p)
+        self.issuedCapIDs[addr] = cap.id
+
+        if let ctrl = self.account.capabilities.storage.getController(byCapabilityID: cap.id) {
+            ctrl.setTag("tidalyield-beta")
+        }
+
+        emit BetaGranted(addr: addr, capID: cap.id)
+        return cap
+    }
+
+    /// Delete the recorded controller, revoking *all copies* of the capability
+    access(contract) fun _revokeByAddress(_ addr: Address) {
+        let id = self.issuedCapIDs[addr] ?? panic("No cap recorded for address")
+        let ctrl = self.account.capabilities.storage.getController(byCapabilityID: id)
+            ?? panic("Missing controller for recorded cap ID")
+        ctrl.delete()
+        self.issuedCapIDs.remove(key: addr)
+        emit BetaRevoked(addr: addr, capID: id)
+    }
+
     // 2) A small in-account helper resource that performs privileged ops
     access(all) resource AdminHandle {
-        access(Admin) fun grantBeta(addr: Address): Capability<&{TidalYieldClosedBeta.BetaBadge}> {
-            // Store a badge under a path derived from the user address, but in ADMIN storage
-            let path = StoragePath(identifier: "TY_BetaBadge_".concat(addr.toString()))!
-            // create only once
-            if self.account.storage.type(at: path) == nil {
-                self.account.storage.save(<-create TidalYieldClosedBeta.BetaBadge(addr), to: path)
-            }
-            // Issue a capability FROM ADMIN (controller in admin)
-            let cap: Capability<&{TidalYieldClosedBeta.BetaBadge}> =
-                self.account.capabilities.storage.issue<&{TidalYieldClosedBeta.BetaBadge}>(path)
-            TidalYieldClosedBeta.issuedCapIDs[addr] = cap.id
-
-            return cap
+        access(Admin) fun grantBeta(addr: Address): Capability<&{TidalYieldClosedBeta.IBeta}> {
+            TidalYieldClosedBeta._ensureBadge(addr)
+            return TidalYieldClosedBeta._issueBadgeCap(addr)
         }
 
         access(Admin) fun revokeByAddress(addr: Address) {
-            let id = TidalYieldClosedBeta.issuedCapIDs[addr] ?? panic("No cap recorded")
-            let ctrl = self.account.capabilities.storage.getController(byCapabilityID: id)
-                ?? panic("Missing controller")
-            ctrl.delete()
-            TidalYieldClosedBeta.issuedCapIDs.remove(key: addr)
+            TidalYieldClosedBeta._revokeByAddress(addr)
         }
     }
 

cadence/transactions/tidal-yield/admin/grant_beta.cdc

@@ -1,32 +1,30 @@
 import "TidalYieldClosedBeta"
 
 /// Saves a copy of the admin-issued cap into the user's account
-/// and (optionally) publishes it under /public for easy script checks.
-transaction(publishPublic: Bool) {
+/// and publishes it under /public for easy script checks.
+transaction() {
 
     prepare(
         admin: auth(Capabilities) &Account,
         user:  auth(Storage, Capabilities) &Account
     ) {
-        // 1) Admin issues (controller lives in ADMIN)
         let adminCap: Capability<auth(TidalYieldClosedBeta.Admin) &TidalYieldClosedBeta.AdminHandle> =
-        admin.capabilities.storage.issue<auth(TidalYieldClosedBeta.Admin) &TidalYieldClosedBeta.AdminHandle>(
-            TidalYieldClosedBeta.AdminHandleStoragePath
-        )
+            admin.capabilities.storage.issue<auth(TidalYieldClosedBeta.Admin) &TidalYieldClosedBeta.AdminHandle>(
+                TidalYieldClosedBeta.AdminHandleStoragePath
+            )
         let handle: auth(TidalYieldClosedBeta.Admin) &TidalYieldClosedBeta.AdminHandle =
-        adminCap.borrow() ?? panic("Missing AdminHandle")
+            adminCap.borrow() ?? panic("Missing AdminHandle")
+
+        let cap: Capability<&{TidalYieldClosedBeta.IBeta}> =
+            handle.grantBeta(addr: user.address)
 
-        let cap: Capability<&{TidalYieldClosedBeta.BetaBadge}> =
-        handle.grantBeta(addr: user.address)
+        user.storage.save(cap, to: TidalYieldClosedBeta.BetaBadgeStoragePath)
 
-        // 2) Save a COPY of the capability value in the user's /storage
-        let userCapPath = StoragePath(identifier: "TY_UserBetaCap")!
-        user.storage.save(cap, to: userCapPath)
+        let copyCap = user.capabilities.storage.issue<&{TidalYieldClosedBeta.IBeta}>(TidalYieldClosedBeta.BetaBadgeStoragePath)
 
-        // 3) Optionally publish in /public for scriptable checks
-        if publishPublic {
-            let userPubPath = PublicPath(identifier: "TY_Beta")!
-            user.capabilities.publish<&{TidalYieldClosedBeta.BetaBadge}>(userCapPath, at: userPubPath)
-        }
+        user.capabilities.publish(
+           copyCap, 
+            at: TidalYieldClosedBeta.BetaBadgePublicPath
+        )
     }
 }

cadence/transactions/tidal-yield/create_tide.cdc

@@ -52,8 +52,12 @@ transaction(strategyIdentifier: String, vaultIdentifier: String, amount: UFix64)
         }
         self.manager = signer.storage.borrow<&TidalYield.TideManager>(from: TidalYield.TideManagerStoragePath)
             ?? panic("Signer does not have a TideManager stored at path \(TidalYield.TideManagerStoragePath) - configure and retry")
-        self.betaRef = signer.storage.borrow<&{TidalYieldClosedBeta.IBeta}>(from: TidalYieldClosedBeta.BetaBadgeStoragePath)
+        let betaCap = signer.storage.copy<Capability<&{TidalYieldClosedBeta.IBeta}>>(from: TidalYieldClosedBeta.BetaBadgeStoragePath)
             ?? panic("Signer doesn not have a BetaBadge stored at path \(TidalYieldClosedBeta.BetaBadgeStoragePath) - configure and retry")
+
+        self.betaRef = betaCap.borrow()
+            ?? panic("Capability does not contain corret reference")
+
     }
 
     execute {