From 0ac49f6c868cecf5a1811936c989538c8726d1d4 Mon Sep 17 00:00:00 2001 From: Giovanni Sanchez <108043524+sisyphusSmiling@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:51:52 -0600 Subject: [PATCH] bump bridge storage fee calculation estimate to 400kB per txn --- cadence/transactions/bridge/nft/batch_bridge_nft_from_evm.cdc | 2 +- .../bridge/nft/batch_bridge_nft_to_any_cadence_address.cdc | 2 +- .../bridge/nft/batch_bridge_nft_to_any_evm_address.cdc | 2 +- cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc | 2 +- cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc | 2 +- .../bridge/nft/bridge_nft_to_any_cadence_address.cdc | 2 +- .../transactions/bridge/nft/bridge_nft_to_any_evm_address.cdc | 2 +- cadence/transactions/bridge/nft/bridge_nft_to_evm.cdc | 2 +- 8 files changed, 8 insertions(+), 8 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 index f6705b18..36ea1574 100644 --- a/cadence/transactions/bridge/nft/batch_bridge_nft_from_evm.cdc +++ b/cadence/transactions/bridge/nft/batch_bridge_nft_from_evm.cdc @@ -66,7 +66,7 @@ transaction(nftIdentifier: String, ids: [UInt256]) { // // Set a cap on the withdrawable bridge fee var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction ) + (FlowEVMBridgeConfig.baseFee * UFix64(ids.length)) // Issue and store bridge-dedicated Provider Capability in storage if necessary if signer.storage.type(at: FlowEVMBridgeConfig.providerCapabilityStoragePath) == nil { 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 index 8e52a6a8..686d26bb 100644 --- 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 @@ -69,7 +69,7 @@ transaction(nftIdentifier: String, ids: [UInt256], recipient: Address) { // // Set a cap on the withdrawable bridge fee var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction ) + (FlowEVMBridgeConfig.baseFee * UFix64(ids.length)) // Issue and store bridge-dedicated Provider Capability in storage if necessary if signer.storage.type(at: FlowEVMBridgeConfig.providerCapabilityStoragePath) == nil { 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 index 92afd18a..0a2b9995 100644 --- 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 @@ -62,7 +62,7 @@ transaction(nftIdentifier: String, ids: [UInt64], recipient: String) { // Withdraw the requested NFT & set a cap on the withdrawable bridge fee var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + 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) diff --git a/cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc b/cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc index 4224965e..b8b6489c 100644 --- a/cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc +++ b/cadence/transactions/bridge/nft/batch_bridge_nft_to_evm.cdc @@ -61,7 +61,7 @@ transaction(nftIdentifier: String, ids: [UInt64]) { // Withdraw the requested NFT & set a cap on the withdrawable bridge fee var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + 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) diff --git a/cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc b/cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc index e569da73..8c2b9907 100644 --- a/cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc +++ b/cadence/transactions/bridge/nft/bridge_nft_from_evm.cdc @@ -66,7 +66,7 @@ transaction(nftIdentifier: String, id: UInt256) { // // Set a cap on the withdrawable bridge fee var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction ) // Issue and store bridge-dedicated Provider Capability in storage if necessary if signer.storage.type(at: FlowEVMBridgeConfig.providerCapabilityStoragePath) == nil { diff --git a/cadence/transactions/bridge/nft/bridge_nft_to_any_cadence_address.cdc b/cadence/transactions/bridge/nft/bridge_nft_to_any_cadence_address.cdc index 6513cffb..f90bed20 100644 --- a/cadence/transactions/bridge/nft/bridge_nft_to_any_cadence_address.cdc +++ b/cadence/transactions/bridge/nft/bridge_nft_to_any_cadence_address.cdc @@ -69,7 +69,7 @@ transaction(nftIdentifier: String, id: UInt256, recipient: Address) { // // Set a cap on the withdrawable bridge fee var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction ) // Issue and store bridge-dedicated Provider Capability in storage if necessary if signer.storage.type(at: FlowEVMBridgeConfig.providerCapabilityStoragePath) == nil { diff --git a/cadence/transactions/bridge/nft/bridge_nft_to_any_evm_address.cdc b/cadence/transactions/bridge/nft/bridge_nft_to_any_evm_address.cdc index 80182974..221be214 100644 --- a/cadence/transactions/bridge/nft/bridge_nft_to_any_evm_address.cdc +++ b/cadence/transactions/bridge/nft/bridge_nft_to_any_evm_address.cdc @@ -54,7 +54,7 @@ transaction(nftIdentifier: String, id: UInt64, recipient: String) { // Withdraw the requested NFT & calculate the approximate bridge fee based on NFT storage usage self.nft <- collection.withdraw(withdrawID: id) var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction ) // Determine if the NFT requires onboarding - this impacts the fee required self.requiresOnboarding = FlowEVMBridge.typeRequiresOnboarding(self.nft.getType()) diff --git a/cadence/transactions/bridge/nft/bridge_nft_to_evm.cdc b/cadence/transactions/bridge/nft/bridge_nft_to_evm.cdc index 9a987a3d..449ef397 100644 --- a/cadence/transactions/bridge/nft/bridge_nft_to_evm.cdc +++ b/cadence/transactions/bridge/nft/bridge_nft_to_evm.cdc @@ -61,7 +61,7 @@ transaction(nftIdentifier: String, id: UInt64) { // Withdraw the requested NFT & set a cap on the withdrawable bridge fee self.nft <- collection.withdraw(withdrawID: id) var approxFee = FlowEVMBridgeUtils.calculateBridgeFee( - bytes: 200_000 // 200 kB as upper bound on movable storage used in a single transaction + bytes: 400_000 // 400 kB as upper bound on movable storage used in a single transaction ) // Determine if the NFT requires onboarding - this impacts the fee required self.requiresOnboarding = FlowEVMBridge.typeRequiresOnboarding(self.nft.getType())