update bridging txn error messages

onflow · Oct 29, 2024 · d043d98 · d043d98
1 parent 1dd624c
commit d043d98
Show file tree

Hide file tree

Showing 12 changed files with 129 additions and 70 deletions.
diff --git a/cadence/transactions/bridge/nft/batch_bridge_nft_from_evm.cdc b/cadence/transactions/bridge/nft/batch_bridge_nft_from_evm.cdc
@@ -31,7 +31,7 @@ transaction(nftIdentifier: String, ids: [UInt256]) {
         //
         // Borrow a reference to the signer's COA
         self.coa = signer.storage.borrow<auth(EVM.Bridge) &EVM.CadenceOwnedAccount>(from: /storage/evm)
-            ?? panic("Could not borrow COA from provided gateway address")
+            ?? panic("Could not borrow COA signer's account at path /storage/evm")
 
         /* --- Construct the NFT type --- */
         //
@@ -49,12 +49,13 @@ transaction(nftIdentifier: String, ids: [UInt256]) {
         // Borrow a reference to the NFT collection, configuring if necessary
         let viewResolver = getAccount(nftContractAddress).contracts.borrow<&{ViewResolver}>(name: nftContractName)
             ?? panic("Could not borrow ViewResolver from NFT contract with name "
-                          .concat(nftContractName).concat(" and address ")
-                          .concat(nftContractAddress.toString()))
+                .concat(nftContractName).concat(" and address ")
+                .concat(nftContractAddress.toString()))
         let collectionData = viewResolver.resolveContractView(
                 resourceType: self.nftType,
                 viewType: Type<MetadataViews.NFTCollectionData>()
-            ) as! MetadataViews.NFTCollectionData? ?? panic("Could not resolve NFTCollectionData view")
+            ) as! MetadataViews.NFTCollectionData?
+            ?? panic("Could not resolve NFTCollectionData view for NFT type ".concat(self.nftType.identifier))
         if signer.storage.borrow<&{NonFungibleToken.Collection}>(from: collectionData.storagePath) == nil {
             signer.storage.save(<-collectionData.createEmptyCollection(), to: collectionData.storagePath)
             signer.capabilities.unpublish(collectionData.publicPath)
@@ -81,7 +82,8 @@ transaction(nftIdentifier: String, ids: [UInt256]) {
         // Copy the stored Provider capability and create a ScopedFTProvider
         let providerCapCopy = signer.storage.copy<Capability<auth(FungibleToken.Withdraw) &{FungibleToken.Provider}>>(
                 from: FlowEVMBridgeConfig.providerCapabilityStoragePath
-            ) ?? panic("Invalid Provider Capability found in storage.")
+            ) ?? panic("Invalid FungibleToken Provider Capability found in storage at path "
+                .concat(FlowEVMBridgeConfig.providerCapabilityStoragePath.toString()))
         let providerFilter = ScopedFTProviders.AllowanceFilter(approxFee)
         self.scopedProvider <- ScopedFTProviders.createScopedFTProvider(
                 provider: providerCapCopy,
@@ -102,7 +104,7 @@ transaction(nftIdentifier: String, ids: [UInt256]) {
             // Ensure the bridged nft is the correct type
             assert(
                 nft.getType() == self.nftType,
-                message: "Bridged nft type mismatch - requeswted: ".concat(self.nftType.identifier)
+                message: "Bridged nft type mismatch - requested: ".concat(self.nftType.identifier)
                     .concat(", received: ").concat(nft.getType().identifier)
             )
             // Deposit the bridged NFT into the signer's collection

diff --git a/cadence/transactions/bridge/nft/batch_bridge_nft_to_any_cadence_address.cdc b/cadence/transactions/bridge/nft/batch_bridge_nft_to_any_cadence_address.cdc
@@ -33,7 +33,7 @@ transaction(nftIdentifier: String, ids: [UInt256], recipient: Address) {
         //
         // Borrow a reference to the signer's COA
         self.coa = signer.storage.borrow<auth(EVM.Bridge) &EVM.CadenceOwnedAccount>(from: /storage/evm)
-            ?? panic("Could not borrow COA from provided gateway address")
+            ?? panic("Could not borrow COA signer's account at path /storage/evm")
 
         /* --- Construct the NFT type --- */
         //
@@ -50,11 +50,14 @@ transaction(nftIdentifier: String, ids: [UInt256], recipient: Address) {
         //
         // Borrow a reference to the NFT collection, configuring if necessary
         let viewResolver = getAccount(nftContractAddress).contracts.borrow<&{ViewResolver}>(name: nftContractName)
-            ?? panic("Could not borrow ViewResolver from NFT contract")
+            ?? panic("Could not borrow ViewResolver from NFT contract with name "
+                .concat(nftContractName).concat(" and address ")
+                .concat(nftContractAddress.toString()))
         let collectionData = viewResolver.resolveContractView(
                 resourceType: self.nftType,
                 viewType: Type<MetadataViews.NFTCollectionData>()
-            ) as! MetadataViews.NFTCollectionData? ?? panic("Could not resolve NFTCollectionData view")
+            ) as! MetadataViews.NFTCollectionData?
+            ?? panic("Could not resolve NFTCollectionData view for NFT type ".concat(self.nftType.identifier))
         // Configure the signer's account for this NFT
         if signer.storage.borrow<&{NonFungibleToken.Collection}>(from: collectionData.storagePath) == nil {
             signer.storage.save(<-collectionData.createEmptyCollection(), to: collectionData.storagePath)
@@ -63,7 +66,7 @@ transaction(nftIdentifier: String, ids: [UInt256], recipient: Address) {
             signer.capabilities.publish(collectionCap, at: collectionData.publicPath)
         }
         self.receiver = getAccount(recipient).capabilities.borrow<&{NonFungibleToken.Receiver}>(collectionData.publicPath)
-            ?? panic("Could not borrow Receiver from recipient's public capability path")
+            ?? panic("Could not borrow NonFungibleToken Receiver from recipient's public capability path")
 
         /* --- Configure a ScopedFTProvider --- */
         //
@@ -81,7 +84,8 @@ transaction(nftIdentifier: String, ids: [UInt256], recipient: Address) {
         // Copy the stored Provider capability and create a ScopedFTProvider
         let providerCapCopy = signer.storage.copy<Capability<auth(FungibleToken.Withdraw) &{FungibleToken.Provider}>>(
                 from: FlowEVMBridgeConfig.providerCapabilityStoragePath
-            ) ?? panic("Invalid Provider Capability found in storage.")
+            ) ?? panic("Invalid FungibleToken Provider Capability found in storage at path "
+                .concat(FlowEVMBridgeConfig.providerCapabilityStoragePath.toString()))
         let providerFilter = ScopedFTProviders.AllowanceFilter(approxFee)
         self.scopedProvider <- ScopedFTProviders.createScopedFTProvider(
                 provider: providerCapCopy,
@@ -102,7 +106,7 @@ transaction(nftIdentifier: String, ids: [UInt256], recipient: Address) {
             // Ensure the bridged nft is the correct type
             assert(
                 nft.getType() == self.nftType,
-                message: "Bridged nft type mismatch - requeswted: ".concat(self.nftType.identifier)
+                message: "Bridged nft type mismatch - requested: ".concat(self.nftType.identifier)
                     .concat(", received: ").concat(nft.getType().identifier)
             )
             // Deposit the bridged NFT into the signer's collection

diff --git a/cadence/transactions/bridge/nft/batch_bridge_nft_to_any_evm_address.cdc b/cadence/transactions/bridge/nft/batch_bridge_nft_to_any_evm_address.cdc
@@ -34,7 +34,7 @@ transaction(nftIdentifier: String, ids: [UInt64], recipient: String) {
         //
         // Borrow a reference to the signer's COA
         self.coa = signer.storage.borrow<auth(EVM.Bridge) &EVM.CadenceOwnedAccount>(from: /storage/evm)
-            ?? panic("Could not borrow COA from provided gateway address")
+            ?? panic("Could not borrow COA signer's account at path /storage/evm")
 
         /* --- Construct the NFT type --- */
         //
@@ -51,22 +51,26 @@ transaction(nftIdentifier: String, ids: [UInt64], recipient: String) {
         //
         // Borrow a reference to the NFT collection, configuring if necessary
         let viewResolver = getAccount(nftContractAddress).contracts.borrow<&{ViewResolver}>(name: nftContractName)
-            ?? panic("Could not borrow ViewResolver from NFT contract")
+            ?? panic("Could not borrow ViewResolver from NFT contract with name "
+                .concat(nftContractName).concat(" and address ")
+                .concat(nftContractAddress.toString()))
         let collectionData = viewResolver.resolveContractView(
                 resourceType: self.nftType,
                 viewType: Type<MetadataViews.NFTCollectionData>()
-            ) as! MetadataViews.NFTCollectionData? ?? panic("Could not resolve NFTCollectionData view")
+            ) as! MetadataViews.NFTCollectionData?
+            ?? panic("Could not resolve NFTCollectionData view for NFT type ".concat(self.nftType.identifier))
         self.collection = signer.storage.borrow<auth(NonFungibleToken.Withdraw) &{NonFungibleToken.Collection}>(
                 from: collectionData.storagePath
-            ) ?? panic("Could not access signer's NFT Collection")
+            ) ?? panic("Could not borrow a NonFungibleToken Collection from the signer's storage path "
+                .concat(collectionData.storagePath.toString()))
 
         // Withdraw the requested NFT & set a cap on the withdrawable bridge fee
         var approxFee = FlowEVMBridgeUtils.calculateBridgeFee(
                 bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction
             ) + (FlowEVMBridgeConfig.baseFee * UFix64(ids.length))
         // Determine if the NFT requires onboarding - this impacts the fee required
         self.requiresOnboarding = FlowEVMBridge.typeRequiresOnboarding(self.nftType)
-            ?? panic("Bridge does not support this asset type")
+            ?? panic("Bridge does not support the requested asset type ".concat(nftIdentifier))
         // Add the onboarding fee if onboarding is necessary
         if self.requiresOnboarding {
             approxFee = approxFee + FlowEVMBridgeConfig.onboardFee
@@ -84,7 +88,8 @@ transaction(nftIdentifier: String, ids: [UInt64], recipient: String) {
         // Copy the stored Provider capability and create a ScopedFTProvider
         let providerCapCopy = signer.storage.copy<Capability<auth(FungibleToken.Withdraw) &{FungibleToken.Provider}>>(
                 from: FlowEVMBridgeConfig.providerCapabilityStoragePath
-            ) ?? panic("Invalid Provider Capability found in storage.")
+            ) ?? panic("Invalid FungibleToken Provider Capability found in storage at path "
+                .concat(FlowEVMBridgeConfig.providerCapabilityStoragePath.toString()))
         let providerFilter = ScopedFTProviders.AllowanceFilter(approxFee)
         self.scopedProvider <- ScopedFTProviders.createScopedFTProvider(
                 provider: providerCapCopy,

diff --git a/cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc b/cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc
@@ -33,7 +33,7 @@ transaction(nftIdentifier: String, ids: [UInt64]) {
         //
         // Borrow a reference to the signer's COA
         self.coa = signer.storage.borrow<auth(EVM.Bridge) &EVM.CadenceOwnedAccount>(from: /storage/evm)
-            ?? panic("Could not borrow COA from provided gateway address")
+            ?? panic("Could not borrow COA signer's account at path /storage/evm")
 
         /* --- Construct the NFT type --- */
         //
@@ -50,22 +50,26 @@ transaction(nftIdentifier: String, ids: [UInt64]) {
         //
         // Borrow a reference to the NFT collection, configuring if necessary
         let viewResolver = getAccount(nftContractAddress).contracts.borrow<&{ViewResolver}>(name: nftContractName)
-            ?? panic("Could not borrow ViewResolver from NFT contract")
+            ?? panic("Could not borrow ViewResolver from NFT contract with name "
+                .concat(nftContractName).concat(" and address ")
+                .concat(nftContractAddress.toString()))
         let collectionData = viewResolver.resolveContractView(
                 resourceType: self.nftType,
                 viewType: Type<MetadataViews.NFTCollectionData>()
-            ) as! MetadataViews.NFTCollectionData? ?? panic("Could not resolve NFTCollectionData view")
+            ) as! MetadataViews.NFTCollectionData?
+            ?? panic("Could not resolve NFTCollectionData view for NFT type ".concat(self.nftType.identifier))
         self.collection = signer.storage.borrow<auth(NonFungibleToken.Withdraw) &{NonFungibleToken.Collection}>(
                 from: collectionData.storagePath
-            ) ?? panic("Could not access signer's NFT Collection")
+            ) ?? panic("Could not borrow a NonFungibleToken Collection from the signer's storage path "
+                .concat(collectionData.storagePath.toString()))
 
         // Withdraw the requested NFT & set a cap on the withdrawable bridge fee
         var approxFee = FlowEVMBridgeUtils.calculateBridgeFee(
                 bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction
             ) + (FlowEVMBridgeConfig.baseFee * UFix64(ids.length))
         // Determine if the NFT requires onboarding - this impacts the fee required
         self.requiresOnboarding = FlowEVMBridge.typeRequiresOnboarding(self.nftType)
-            ?? panic("Bridge does not support this asset type")
+            ?? panic("Bridge does not support the requested asset type ".concat(nftIdentifier))
         // Add the onboarding fee if onboarding is necessary
         if self.requiresOnboarding {
             approxFee = approxFee + FlowEVMBridgeConfig.onboardFee
@@ -83,7 +87,8 @@ transaction(nftIdentifier: String, ids: [UInt64]) {
         // Copy the stored Provider capability and create a ScopedFTProvider
         let providerCapCopy = signer.storage.copy<Capability<auth(FungibleToken.Withdraw) &{FungibleToken.Provider}>>(
                 from: FlowEVMBridgeConfig.providerCapabilityStoragePath
-            ) ?? panic("Invalid Provider Capability found in storage.")
+            ) ?? panic("Invalid FungibleToken Provider Capability found in storage at path "
+                .concat(FlowEVMBridgeConfig.providerCapabilityStoragePath.toString()))
         let providerFilter = ScopedFTProviders.AllowanceFilter(approxFee)
         self.scopedProvider <- ScopedFTProviders.createScopedFTProvider(
                 provider: providerCapCopy,

diff --git a/cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc b/cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc
@@ -31,7 +31,7 @@ transaction(nftIdentifier: String, id: UInt256) {
         //
         // Borrow a reference to the signer's COA
         self.coa = signer.storage.borrow<auth(EVM.Bridge) &EVM.CadenceOwnedAccount>(from: /storage/evm)
-            ?? panic("Could not borrow COA from provided gateway address")
+            ?? panic("Could not borrow COA signer's account at path /storage/evm")
 
         /* --- Construct the NFT type --- */
         //
@@ -48,19 +48,23 @@ transaction(nftIdentifier: String, id: UInt256) {
         //
         // Borrow a reference to the NFT collection, configuring if necessary
         let viewResolver = getAccount(nftContractAddress).contracts.borrow<&{ViewResolver}>(name: nftContractName)
-            ?? panic("Could not borrow ViewResolver from NFT contract")
+            ?? panic("Could not borrow ViewResolver from NFT contract with name "
+                .concat(nftContractName).concat(" and address ")
+                .concat(nftContractAddress.toString()))
         let collectionData = viewResolver.resolveContractView(
                 resourceType: self.nftType,
                 viewType: Type<MetadataViews.NFTCollectionData>()
-            ) as! MetadataViews.NFTCollectionData? ?? panic("Could not resolve NFTCollectionData view")
+            ) as! MetadataViews.NFTCollectionData?
+            ?? panic("Could not resolve NFTCollectionData view for NFT type ".concat(self.nftType.identifier))
         if signer.storage.borrow<&{NonFungibleToken.Collection}>(from: collectionData.storagePath) == nil {
             signer.storage.save(<-collectionData.createEmptyCollection(), to: collectionData.storagePath)
             signer.capabilities.unpublish(collectionData.publicPath)
             let collectionCap = signer.capabilities.storage.issue<&{NonFungibleToken.Collection}>(collectionData.storagePath)
             signer.capabilities.publish(collectionCap, at: collectionData.publicPath)
         }
         self.collection = signer.storage.borrow<&{NonFungibleToken.Collection}>(from: collectionData.storagePath)
-            ?? panic("Could not borrow collection from storage path")
+            ?? panic("Could not borrow a NonFungibleToken Collection from the signer's storage path "
+                    .concat(collectionData.storagePath.toString()))
 
         /* --- Configure a ScopedFTProvider --- */
         //
@@ -78,7 +82,8 @@ transaction(nftIdentifier: String, id: UInt256) {
         // Copy the stored Provider capability and create a ScopedFTProvider
         let providerCapCopy = signer.storage.copy<Capability<auth(FungibleToken.Withdraw) &{FungibleToken.Provider}>>(
                 from: FlowEVMBridgeConfig.providerCapabilityStoragePath
-            ) ?? panic("Invalid Provider Capability found in storage.")
+            ) ?? panic("Invalid FungibleToken Provider Capability found in storage at path "
+                .concat(FlowEVMBridgeConfig.providerCapabilityStoragePath.toString()))
         let providerFilter = ScopedFTProviders.AllowanceFilter(approxFee)
         self.scopedProvider <- ScopedFTProviders.createScopedFTProvider(
                 provider: providerCapCopy,
@@ -97,7 +102,7 @@ transaction(nftIdentifier: String, id: UInt256) {
         // Ensure the bridged nft is the correct type
         assert(
             nft.getType() == self.nftType,
-            message: "Bridged nft type mismatch - requeswted: ".concat(self.nftType.identifier)
+            message: "Bridged nft type mismatch - requested: ".concat(self.nftType.identifier)
                 .concat(", received: ").concat(nft.getType().identifier)
         )
         // Deposit the bridged NFT into the signer's collection