update staking collection error messages

onflow · Oct 16, 2024 · 0f697ad · 0f697ad
1 parent 541e2ff
commit 0f697ad
Show file tree

Hide file tree

Showing 23 changed files with 272 additions and 220 deletions.
diff --git a/contracts/FlowStakingCollection.cdc b/contracts/FlowStakingCollection.cdc
diff --git a/lib/go/contracts/internal/assets/assets.go b/lib/go/contracts/internal/assets/assets.go
diff --git a/lib/go/templates/internal/assets/assets.go b/lib/go/templates/internal/assets/assets.go
diff --git a/lib/go/templates/manifest.mainnet.json b/lib/go/templates/manifest.mainnet.json
diff --git a/lib/go/templates/manifest.testnet.json b/lib/go/templates/manifest.testnet.json
diff --git a/transactions/stakingCollection/close_stake.cdc b/transactions/stakingCollection/close_stake.cdc
@@ -10,9 +10,7 @@ transaction(nodeID: String, delegatorID: UInt32?) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/create_machine_account.cdc b/transactions/stakingCollection/create_machine_account.cdc
@@ -13,9 +13,7 @@ transaction(nodeID: String,
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
 
         if let machineAccount = self.stakingCollectionRef.createMachineAccountForExistingNode(nodeID: nodeID, payer: account) {
             let sigAlgo = SignatureAlgorithm(rawValue: machineAccountKeySignatureAlgorithm)

diff --git a/transactions/stakingCollection/register_delegator.cdc b/transactions/stakingCollection/register_delegator.cdc
@@ -9,9 +9,7 @@ transaction(id: String, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first in order to register!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/register_multiple_delegators.cdc b/transactions/stakingCollection/register_multiple_delegators.cdc
@@ -9,9 +9,7 @@ transaction(ids: [String], amounts: [UFix64]) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/register_multiple_nodes.cdc b/transactions/stakingCollection/register_multiple_nodes.cdc
@@ -16,9 +16,7 @@ transaction(ids: [String],
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
 
         var i = 0
 

diff --git a/transactions/stakingCollection/register_node.cdc b/transactions/stakingCollection/register_node.cdc
@@ -18,9 +18,7 @@ transaction(id: String,
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first in order to register!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
 
         if let machineAccount = self.stakingCollectionRef.registerNode(
             id: id,

diff --git a/transactions/stakingCollection/request_unstaking.cdc b/transactions/stakingCollection/request_unstaking.cdc
@@ -8,9 +8,7 @@ transaction(nodeID: String, delegatorID: UInt32?, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/restake_all_stakers.cdc b/transactions/stakingCollection/restake_all_stakers.cdc
@@ -9,9 +9,7 @@ transaction {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/stake_new_tokens.cdc b/transactions/stakingCollection/stake_new_tokens.cdc
@@ -10,9 +10,7 @@ transaction(nodeID: String, delegatorID: UInt32?, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/stake_rewarded_tokens.cdc b/transactions/stakingCollection/stake_rewarded_tokens.cdc
@@ -8,9 +8,7 @@ transaction(nodeID: String, delegatorID: UInt32?, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/stake_unstaked_tokens.cdc b/transactions/stakingCollection/stake_unstaked_tokens.cdc
@@ -8,9 +8,7 @@ transaction(nodeID: String, delegatorID: UInt32?, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/transfer_delegator.cdc b/transactions/stakingCollection/transfer_delegator.cdc
@@ -18,9 +18,7 @@ transaction(nodeID: String, delegatorID: UInt32, to: Address) {
 
         // Get a reference to the authorizers StakingCollection
         self.fromStakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
 
         // Get the PublicAccount of the account to transfer the NodeDelegator to. 
         let toAccount = getAccount(to)

diff --git a/transactions/stakingCollection/transfer_node.cdc b/transactions/stakingCollection/transfer_node.cdc
@@ -18,9 +18,7 @@ transaction(nodeID: String, to: Address) {
 
         // Get a reference to the authorizers StakingCollection
         self.fromStakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
 
         // Get the PublicAccount of the account to transfer the NodeStaker to. 
         let toAccount = getAccount(to)

diff --git a/transactions/stakingCollection/unstake_all.cdc b/transactions/stakingCollection/unstake_all.cdc
@@ -8,9 +8,7 @@ transaction(nodeID: String) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/update_networking_address.cdc b/transactions/stakingCollection/update_networking_address.cdc
@@ -8,9 +8,7 @@ transaction(nodeID: String, newAddress: String) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/withdraw_from_machine_account.cdc b/transactions/stakingCollection/withdraw_from_machine_account.cdc
@@ -9,9 +9,7 @@ transaction(nodeID: String, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/withdraw_rewarded_tokens.cdc b/transactions/stakingCollection/withdraw_rewarded_tokens.cdc
@@ -10,9 +10,7 @@ transaction(nodeID: String, delegatorID: UInt32?, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {

diff --git a/transactions/stakingCollection/withdraw_unstaked_tokens.cdc b/transactions/stakingCollection/withdraw_unstaked_tokens.cdc
@@ -10,9 +10,7 @@ transaction(nodeID: String, delegatorID: UInt32?, amount: UFix64) {
 
     prepare(account: auth(BorrowValue) &Account) {
         self.stakingCollectionRef = account.storage.borrow<auth(FlowStakingCollection.CollectionOwner) &FlowStakingCollection.StakingCollection>(from: FlowStakingCollection.StakingCollectionStoragePath)
-            ?? panic("The signer does not store a Staking Collection object at the path "
-                    .concat(FlowStakingCollection.StakingCollectionStoragePath.toString())
-                    .concat(". The signer must initialize their account with this object first!"))
+            ?? panic(FlowStakingCollection.getCollectionMissingError(nil))
     }
 
     execute {