From 19ee59c94e8ad8676b14e9da37d3638183db3198 Mon Sep 17 00:00:00 2001 From: Giovanni Sanchez <108043524+sisyphusSmiling@users.noreply.github.com> Date: Wed, 8 May 2024 17:14:22 -0500 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Jordan Schalm --- cadence/contracts/bridge/FlowEVMBridgeUtils.cdc | 2 +- solidity/src/FlowBridgeDeploymentRegistry.sol | 3 ++- solidity/src/FlowEVMBridgedERC20Deployer.sol | 2 +- solidity/src/FlowEVMBridgedERC721Deployer.sol | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc b/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc index 4d27c2d6..39cf285a 100644 --- a/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc +++ b/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc @@ -277,7 +277,7 @@ contract FlowEVMBridgeUtils { access(all) view fun isValidFlowAsset(type: Type): Bool { let isFlowNFT = type.isSubtype(of: Type<@{NonFungibleToken.NFT}>()) - let isFlowToken = type.isSubtype(of: Type<@{FungibleToken.Vault}>()) + let isFlowFungibleToken = type.isSubtype(of: Type<@{FungibleToken.Vault}>()) return isFlowNFT != isFlowToken } diff --git a/solidity/src/FlowBridgeDeploymentRegistry.sol b/solidity/src/FlowBridgeDeploymentRegistry.sol index 4ca79495..ff34f937 100644 --- a/solidity/src/FlowBridgeDeploymentRegistry.sol +++ b/solidity/src/FlowBridgeDeploymentRegistry.sol @@ -7,7 +7,8 @@ import {FlowEVMDeploymentRegistry} from "./interfaces/FlowEVMDeploymentRegistry. /** * @title FlowBridgeDeploymentRegistry - * @dev A contract to manage the deployment of Flow EVM contracts and their association with Cadence contracts + * @dev A contract to manage the association between bridged Flow EVM contracts and a corresponding Cadence resource type. + * Deployment of new bridged Flow EVM contracts is handled in `FlowBridgeFactory`. */ contract FlowBridgeDeploymentRegistry is FlowEVMDeploymentRegistry, Ownable { constructor() Ownable(msg.sender) { diff --git a/solidity/src/FlowEVMBridgedERC20Deployer.sol b/solidity/src/FlowEVMBridgedERC20Deployer.sol index 5bfeb013..6d1aa8e2 100644 --- a/solidity/src/FlowEVMBridgedERC20Deployer.sol +++ b/solidity/src/FlowEVMBridgedERC20Deployer.sol @@ -9,7 +9,7 @@ import {FlowEVMBridgedERC20} from "./templates/FlowEVMBridgedERC20.sol"; /** * @title FlowEVMBridgedERC20Deployer - * @dev A contract to deploy FlowEVMBridgedERC20 contracts with named associations to Cadence contracts. Only the + * @dev A contract to deploy FlowEVMBridgedERC20 contracts with named associations to Cadence resources types. Only the * delegated deployer can deploy new contracts. This contract is used by the Flow EVM bridge to deploy and define * bridged ERC20 tokens which are defined natively in Cadence. */ diff --git a/solidity/src/FlowEVMBridgedERC721Deployer.sol b/solidity/src/FlowEVMBridgedERC721Deployer.sol index 86e0c1fb..7f55cde0 100644 --- a/solidity/src/FlowEVMBridgedERC721Deployer.sol +++ b/solidity/src/FlowEVMBridgedERC721Deployer.sol @@ -10,7 +10,7 @@ import {FlowEVMBridgedERC721} from "./templates/FlowEVMBridgedERC721.sol"; /** * @title FlowEVMBridgedERC721Deployer - * @dev A contract to deploy FlowEVMBridgedERC721 contracts with named associations to Cadence contracts. Only the + * @dev A contract to deploy FlowEVMBridgedERC721 contracts with named associations to Cadence resource types. Only the * delegated deployer can deploy new contracts. This contract is used by the Flow EVM bridge to deploy and define * bridged ERC721 tokens which are defined natively in Cadence. */