add FLOW filter on fromEVM requests & remove unused entitlement

onflow · Apr 15, 2024 · e13f8a9 · e13f8a9
1 parent e6b186c
commit e13f8a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cadence/contracts/bridge/FlowEVMBridge.cdc b/cadence/contracts/bridge/FlowEVMBridge.cdc
@@ -472,6 +472,7 @@ contract FlowEVMBridge : IFlowEVMNFTBridge, IFlowEVMTokenBridge {
             feeProvider.isAvailableToWithdraw(amount: FlowEVMBridgeUtils.calculateBridgeFee(used: 0, includeBase: true)):
                 "Insufficient fee paid"
             !type.isSubtype(of: Type<@{NonFungibleToken.Collection}>()): "Mixed asset types are not yet supported"
+            !type.isInstance(Type<@FlowToken.Vault>()): "Must use the CadenceOwnedAccount interface to bridge $FLOW from EVM"
             self.typeRequiresOnboarding(type) == false: "NFT must first be onboarded"
         }
         // Withdraw from feeProvider and deposit to self

diff --git a/cadence/contracts/bridge/FlowEVMBridgeAccessor.cdc b/cadence/contracts/bridge/FlowEVMBridgeAccessor.cdc
@@ -12,9 +12,6 @@ access(all)
 contract FlowEVMBridgeAccessor {
 
     access(all) let StoragePath: StoragePath
-
-    /// Entitlement allowing for updates to the Router
-    access(all) entitlement RouterAdmin
 
     /// BridgeAccessor implementation used by the EVM contract to route bridge calls from COA resources
     ///
@@ -124,6 +121,7 @@ contract FlowEVMBridgeAccessor {
                     executed: "Callback must be executed"
                 }
                 executed = true
+                is
                 return caller.call(
                     to: FlowEVMBridge.getAssociatedEVMAddress(with: type)
                         ?? panic("No EVM address associated with type"),