remove MigrationContractStaging Host path derivation with constant

README.md

@@ -65,12 +65,11 @@ transaction(contractName: String, contractCode: String) {
     
     prepare(signer: AuthAccount) {
         // Configure Host resource if needed
-        let hostStoragePath: StoragePath = MigrationContractStaging.deriveHostStoragePath(hostAddress: signer.address)
-        if signer.borrow<&MigrationContractStaging.Host>(from: hostStoragePath) == nil {
-            signer.save(<-MigrationContractStaging.createHost(), to: hostStoragePath)
+        if signer.borrow<&MigrationContractStaging.Host>(from: MigrationContractStaging.HostStoragePath) == nil {
+            signer.save(<-MigrationContractStaging.createHost(), to: MigrationContractStaging.HostStoragePath)
         }
         // Assign Host reference
-        self.host = signer.borrow<&MigrationContractStaging.Host>(from: hostStoragePath)!
+        self.host = signer.borrow<&MigrationContractStaging.Host>(from: MigrationContractStaging.HostStoragePath)!
     }
 
     execute {
@@ -126,7 +125,7 @@ The basic interface to stage a contract is the same as deploying a contract - na
 `stageContract()` again for the same contract will overwrite any existing staged code for that contract.
 
 ```cadence
-/// 1 - Create a host and save it in your contract-hosting account at the path derived from deriveHostStoragePath().
+/// 1 - Create a host and save it in your contract-hosting account at MigrationContractStaging.HostStoragePath
 access(all) fun createHost(): @Host
 /// 2 - Call stageContract() with the host reference and contract name and contract code you wish to stage.
 access(all) fun stageContract(host: &Host, name: String, code: String)
@@ -181,7 +180,7 @@ access(all) resource Capsule {
 }
 ```
 
-To support ongoing staging progress across the network, the single `StagingStatusUpdated` event is emitted any time a
+To support monitoring staging progress across the network, the single `StagingStatusUpdated` event is emitted any time a
 contract is staged (`status == true`), staged code is replaced (`status == false`), or a contract is unstaged (`status
 == nil`).
 

contracts/MigrationContractStaging.cdc

@@ -12,11 +12,11 @@
 ///
 access(all) contract MigrationContractStaging {
 
-    // Path derivation constants
+    // Path constants
     //
     access(self) let delimiter: String
-    access(self) let hostPathPrefix: String
     access(self) let capsulePathPrefix: String
+    access(all) let HostStoragePath: StoragePath
     /// Maps contract addresses to an array of staged contract names
     access(self) let stagedContracts: {Address: [String]}
 
@@ -37,7 +37,7 @@ access(all) contract MigrationContractStaging {
 
     /* --- Staging Methods --- */
 
-    /// 1 - Create a host and save it in your contract-hosting account at the path derived from deriveHostStoragePath()
+    /// 1 - Create a host and save it in your contract-hosting account at MigrationContractStaging.HostStoragePath
     ///
     /// Creates a Host serving as identification for the contract account. Reference to this resource identifies the
     /// calling address so it must be saved in account storage before being used to stage a contract update.
@@ -147,16 +147,6 @@ access(all) contract MigrationContractStaging {
         return stagedCode
     }
 
-    /// Returns a StoragePath to store the Host of the form:
-    ///     /storage/self.hostPathPrefix_ADDRESS
-    access(all) fun deriveHostStoragePath(hostAddress: Address): StoragePath {
-        return StoragePath(
-                identifier: self.hostPathPrefix
-                    .concat(self.delimiter)
-                    .concat(hostAddress.toString())
-            ) ?? panic("Could not derive Host StoragePath for given address")
-    }
-
     /// Returns a StoragePath to store the Capsule of the form:
     ///     /storage/self.capsulePathPrefix_ADDRESS_NAME
     access(all) fun deriveCapsuleStoragePath(contractAddress: Address, contractName: String): StoragePath {
@@ -325,9 +315,9 @@ access(all) contract MigrationContractStaging {
 
     init() {
         self.delimiter = "_"
-        self.hostPathPrefix = "MigrationContractStagingHost".concat(self.delimiter)
-            .concat(self.delimiter)
-            .concat(self.account.address.toString())
+        self.HostStoragePath = StoragePath(
+                identifier: "MigrationContractStagingHost".concat(self.delimiter).concat(self.account.address.toString())
+            ) ?? panic("Could not derive Host StoragePath")
         self.capsulePathPrefix = "MigrationContractStagingCapsule"
             .concat(self.delimiter)
             .concat(self.account.address.toString())

transactions/migration-contract-staging/stage_contract.cdc

@@ -15,12 +15,11 @@ transaction(contractName: String, contractCode: String) {
 
     prepare(signer: AuthAccount) {
         // Configure Host resource if needed
-        let hostStoragePath: StoragePath = MigrationContractStaging.deriveHostStoragePath(hostAddress: signer.address)
-        if signer.borrow<&MigrationContractStaging.Host>(from: hostStoragePath) == nil {
-            signer.save(<-MigrationContractStaging.createHost(), to: hostStoragePath)
+        if signer.borrow<&MigrationContractStaging.Host>(from: MigrationContractStaging.HostStoragePath) == nil {
+            signer.save(<-MigrationContractStaging.createHost(), to: MigrationContractStaging.HostStoragePath)
         }
         // Assign Host reference
-        self.host = signer.borrow<&MigrationContractStaging.Host>(from: hostStoragePath)!
+        self.host = signer.borrow<&MigrationContractStaging.Host>(from: MigrationContractStaging.HostStoragePath)!
     }
 
     execute {

transactions/migration-contract-staging/unstage_contract.cdc

@@ -10,8 +10,7 @@ transaction(contractName: String) {
 
     prepare(signer: AuthAccount) {
         // Assign Host reference
-        let hostStoragePath: StoragePath = MigrationContractStaging.deriveHostStoragePath(hostAddress: signer.address)
-        self.host = signer.borrow<&MigrationContractStaging.Host>(from: hostStoragePath)
+        self.host = signer.borrow<&MigrationContractStaging.Host>(from: MigrationContractStaging.HostStoragePath)
             ?? panic("Host was not found in storage")
     }