Merge pull request #97 from onflow/update-evm-address-comparator

Update `EVMAddress` comparison implementation
onflow · Jul 3, 2024 · aed9fbb · aed9fbb
2 parents ae9e49e + 67e41df
commit aed9fbb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cadence/contracts/bridge/FlowEVMBridgeConfig.cdc b/cadence/contracts/bridge/FlowEVMBridgeConfig.cdc
@@ -386,7 +386,7 @@ contract FlowEVMBridgeConfig {
             // EVM address is different, update the association
             FlowEVMBridgeConfig.associateType(targetType, with: targetEVMAddress)
             assert(
-                FlowEVMBridgeConfig.getEVMAddressAssociated(with: targetType)!.bytes == targetEVMAddress.bytes,
+                FlowEVMBridgeConfig.getEVMAddressAssociated(with: targetType)!.equals(targetEVMAddress),
                 message: "Problem associating target Type and target EVM Address"
             )
 

diff --git a/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc b/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc
@@ -580,7 +580,7 @@ contract FlowEVMBridgeUtils {
         let decodedCallResult = EVM.decodeABI(types: [Type<EVM.EVMAddress>()], data: callResult.data)
         if decodedCallResult.length == 1 {
             let actualOwner = decodedCallResult[0] as! EVM.EVMAddress
-            return actualOwner.bytes == owner.bytes
+            return actualOwner.equals(owner)
         }
         return false
     }
@@ -606,7 +606,7 @@ contract FlowEVMBridgeUtils {
         let decodedCallResult = EVM.decodeABI(types: [Type<EVM.EVMAddress>()], data: callResult.data)
         if decodedCallResult.length == 1 {
             let actualApproved = decodedCallResult[0] as! EVM.EVMAddress
-            return actualApproved.bytes == owner.bytes
+            return actualApproved.equals(owner)
         }
         return false
     }

diff --git a/cadence/contracts/bridge/interfaces/FlowEVMBridgeHandlerInterfaces.cdc b/cadence/contracts/bridge/interfaces/FlowEVMBridgeHandlerInterfaces.cdc
@@ -77,7 +77,7 @@ access(all) contract FlowEVMBridgeHandlerInterfaces {
                 self.getTargetEVMAddress() == nil: "Target EVM address has already been set"
             }
             post {
-                self.getTargetEVMAddress()!.bytes == address!.bytes: "Problem setting target EVM address"
+                self.getTargetEVMAddress()!.equals(address!): "Problem setting target EVM address"
             }
         }
         access(Admin) fun setMinter(_ minter: @{FlowEVMBridgeHandlerInterfaces.TokenMinter}) {