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..2997e855 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) @@ -70,7 +70,6 @@ transaction(nftIdentifier: String, ids: [UInt64]) { if self.requiresOnboarding { approxFee = approxFee + FlowEVMBridgeConfig.onboardFee } - log(approxFee) /* --- Configure a ScopedFTProvider --- */ // 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()) diff --git a/cadence/transactions/bridge/tokens/bridge_tokens_from_evm.cdc b/cadence/transactions/bridge/tokens/bridge_tokens_from_evm.cdc index 962f784f..c2bb1f92 100644 --- a/cadence/transactions/bridge/tokens/bridge_tokens_from_evm.cdc +++ b/cadence/transactions/bridge/tokens/bridge_tokens_from_evm.cdc @@ -76,7 +76,7 @@ transaction(vaultIdentifier: String, amount: 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/tokens/bridge_tokens_to_any_cadence_address.cdc b/cadence/transactions/bridge/tokens/bridge_tokens_to_any_cadence_address.cdc index 46ac678a..54d076eb 100644 --- a/cadence/transactions/bridge/tokens/bridge_tokens_to_any_cadence_address.cdc +++ b/cadence/transactions/bridge/tokens/bridge_tokens_to_any_cadence_address.cdc @@ -79,7 +79,7 @@ transaction(vaultIdentifier: String, amount: 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/tokens/bridge_tokens_to_any_evm_address.cdc b/cadence/transactions/bridge/tokens/bridge_tokens_to_any_evm_address.cdc index 0a4d12b2..b5c15b55 100644 --- a/cadence/transactions/bridge/tokens/bridge_tokens_to_any_evm_address.cdc +++ b/cadence/transactions/bridge/tokens/bridge_tokens_to_any_evm_address.cdc @@ -57,7 +57,7 @@ transaction(vaultIdentifier: String, amount: UFix64, recipient: String) { // Withdraw the requested balance & set a cap on the withdrawable bridge fee self.sentVault <- vault.withdraw(amount: amount) 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 Vault requires onboarding - this impacts the fee required self.requiresOnboarding = FlowEVMBridge.typeRequiresOnboarding(self.sentVault.getType()) diff --git a/cadence/transactions/bridge/tokens/bridge_tokens_to_evm.cdc b/cadence/transactions/bridge/tokens/bridge_tokens_to_evm.cdc index fdc4e9ae..b60ea6ab 100644 --- a/cadence/transactions/bridge/tokens/bridge_tokens_to_evm.cdc +++ b/cadence/transactions/bridge/tokens/bridge_tokens_to_evm.cdc @@ -61,7 +61,7 @@ transaction(vaultIdentifier: String, amount: UFix64) { // Withdraw the requested balance & set a cap on the withdrawable bridge fee self.sentVault <- vault.withdraw(amount: amount) 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 Vault requires onboarding - this impacts the fee required self.requiresOnboarding = FlowEVMBridge.typeRequiresOnboarding(self.sentVault.getType())