update solidity import patterns & compiled bytecode

onflow · May 6, 2024 · e3c90b5 · e3c90b5
1 parent 5977bcf
commit e3c90b5
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 43 deletions.
diff --git a/cadence/args/deploy-erc20-deployer-args.json b/cadence/args/deploy-erc20-deployer-args.json
diff --git a/cadence/args/deploy-erc721-deployer-args.json b/cadence/args/deploy-erc721-deployer-args.json
diff --git a/cadence/args/deploy-factory-args.json b/cadence/args/deploy-factory-args.json
diff --git a/cadence/tests/test_helpers.cdc b/cadence/tests/test_helpers.cdc
diff --git a/cadence/transactions/evm/create_account.cdc b/cadence/transactions/evm/create_account.cdc
@@ -21,7 +21,6 @@ transaction(amount: UFix64) {
         let coa <- EVM.createCadenceOwnedAccount()
         coa.deposit(from: <-self.sentVault)
 
-        log(coa.balance().inFLOW())
         let storagePath = StoragePath(identifier: "evm")!
         let publicPath = PublicPath(identifier: "evm")!
         self.auth.storage.save<@EVM.CadenceOwnedAccount>(<-coa, to: storagePath)

diff --git a/solidity/src/FlowBridgeDeploymentRegistry.sol b/solidity/src/FlowBridgeDeploymentRegistry.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "./interfaces/FlowEVMDeploymentRegistry.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {FlowEVMDeploymentRegistry} from "./interfaces/FlowEVMDeploymentRegistry.sol";
 
 /**
  * @title FlowBridgeDeploymentRegistry

diff --git a/solidity/src/FlowBridgeFactory.sol b/solidity/src/FlowBridgeFactory.sol
@@ -11,7 +11,12 @@ import {FlowEVMDeploymentRegistry} from "./interfaces/FlowEVMDeploymentRegistry.
 
 /**
  * @title FlowBridgeFactory
- * @dev Factory contract to deploy new FlowEVM bridge contracts, defining Cadence-native assets in EVM
+ * @dev Factory contract to deploy new FlowEVM bridge contracts, defining Cadence-native assets in EVM. Cadence & EVM
+ * contract associations are maintained in a deployment registry. This factory is enabled to deploy contracts via
+ * registered deployer implementations, each of which handle the deployment of a single templated contract indexed by
+ * a human-readable deployer tag. This setup modularizes each key component of the EVM side of the Flow EVM VM bridge,
+ * allowing new asset types to be added by simply adding a new deployer implementation or updated factory contract
+ * to be swapped out without affecting the underlying associations between Cadence and EVM contracts.
  */
 contract FlowBridgeFactory is Ownable {
     // Address of the deployment registry where deployed contract associations are registered

diff --git a/solidity/src/FlowEVMBridgedERC20Deployer.sol b/solidity/src/FlowEVMBridgedERC20Deployer.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "./interfaces/IFlowEVMBridgeDeployer.sol";
-import "./templates/FlowEVMBridgedERC20.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {IFlowEVMBridgeDeployer} from "./interfaces/IFlowEVMBridgeDeployer.sol";
+import {FlowEVMBridgedERC20} from "./templates/FlowEVMBridgedERC20.sol";
 
 /**
  * @title FlowEVMBridgedERC20Deployer
@@ -16,7 +16,7 @@ import "./templates/FlowEVMBridgedERC20.sol";
 contract FlowEVMBridgedERC20Deployer is IFlowEVMBridgeDeployer, ERC165, Ownable {
     // The address of the delegated deployer who can deploy new contracts
     address public delegatedDeployer;
-    
+
     /**
      * @dev Event emitted when a new ERC20 contract is deployed via this deployer
      */

diff --git a/solidity/src/FlowEVMBridgedERC721Deployer.sol b/solidity/src/FlowEVMBridgedERC721Deployer.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "./interfaces/IFlowEVMBridgeDeployer.sol";
-import "./templates/FlowEVMBridgedERC721.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {IFlowEVMBridgeDeployer} from "./interfaces/IFlowEVMBridgeDeployer.sol";
+import {FlowEVMBridgedERC721} from "./templates/FlowEVMBridgedERC721.sol";
 
 /**
  * @title FlowEVMBridgedERC721Deployer

diff --git a/solidity/src/interfaces/BridgePermissions.sol b/solidity/src/interfaces/BridgePermissions.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "./IBridgePermissions.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {IBridgePermissions} from "./IBridgePermissions.sol";
 
 /**
  * @dev Contract for which implementation is checked by the Flow VM bridge as an opt-out mechanism

diff --git a/solidity/src/interfaces/FlowEVMDeploymentRegistry.sol b/solidity/src/interfaces/FlowEVMDeploymentRegistry.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "./IFlowEVMDeploymentRegistry.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
+import {IFlowEVMDeploymentRegistry} from "./IFlowEVMDeploymentRegistry.sol";
 
 /**
  * @title FlowEVMDeploymentRegistry

diff --git a/solidity/src/interfaces/IBridgePermissions.sol b/solidity/src/interfaces/IBridgePermissions.sol
@@ -1,17 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 interface IBridgePermissions is IERC165 {
-
     /**
      * @dev Emitted when the permissions for the contract are updated.
      */
     event PermissionsUpdated(bool newPermissions);
-    
+
     /**
      * @dev Returns true if the contract allows bridging of its assets.
      */
     function allowsBridging() external view returns (bool);
-}
+}
diff --git a/solidity/src/interfaces/IFlowEVMBridgeDeployer.sol b/solidity/src/interfaces/IFlowEVMBridgeDeployer.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IFlowEVMBridgeDeployer

diff --git a/solidity/src/interfaces/IFlowEVMDeploymentRegistry.sol b/solidity/src/interfaces/IFlowEVMDeploymentRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IFlowEVMDeploymentRegistry

diff --git a/solidity/src/templates/FlowEVMBridgedERC20.sol b/solidity/src/templates/FlowEVMBridgedERC20.sol
@@ -2,10 +2,10 @@
 // Compatible with OpenZeppelin Contracts ^5.0.0
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
 contract FlowEVMBridgedERC20 is ERC20, ERC20Burnable, Ownable, ERC20Permit {
     string public flowTokenAddress;

diff --git a/solidity/src/templates/FlowEVMBridgedERC721.sol b/solidity/src/templates/FlowEVMBridgedERC721.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
-import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
-import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
+import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
+import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 contract FlowEVMBridgedERC721 is ERC721, ERC721URIStorage, ERC721Burnable, ERC721Enumerable, Ownable {
     string public flowNFTAddress;