Now that Coordinator is proxied, we no longer need a customized TACoC…

…hildApplication for lynx.
derekpierre · Nov 16, 2023 · c86153b · c86153b
1 parent 820b8a4
commit c86153b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/contracts/contracts/testnet/LynxSet.sol b/contracts/contracts/testnet/LynxSet.sol
@@ -68,22 +68,6 @@ contract MockPolygonChild is Ownable, ITACoChildToRoot, ITACoRootToChild {
     function confirmOperatorAddress(address _operator) external override {}
 }
 
-contract LynxTACoChildApplication is TACoChildApplication, Ownable {
-    constructor(
-        ITACoChildToRoot _rootApplication,
-        uint96 _minimumAuthorization
-    ) TACoChildApplication(_rootApplication, _minimumAuthorization) Ownable(msg.sender) {}
-
-    function setCoordinator(address _coordinator) external onlyOwner {
-        require(_coordinator != address(0), "Coordinator must be specified");
-        require(
-            address(Coordinator(_coordinator).application()) == address(this),
-            "Invalid coordinator"
-        );
-        coordinator = _coordinator;
-    }
-}
-
 contract LynxRitualToken is ERC20("LynxRitualToken", "LRT") {
     constructor(uint256 _totalSupplyOfTokens) {
         _mint(msg.sender, _totalSupplyOfTokens);

diff --git a/deployment/constructor_params/lynx/child.yml b/deployment/constructor_params/lynx/child.yml
@@ -14,9 +14,8 @@ constants:
 
 contracts:
   - MockPolygonChild
-  - LynxTACoChildApplication:
+  - TACoChildApplication:
       proxy:
-        contract_type: TACoChildApplication
       constructor:
         _rootApplication: $MockPolygonChild
         _minimumAuthorization: $FORTY_THOUSAND_TOKENS_IN_WEI_UNITS
@@ -28,7 +27,7 @@ contracts:
         constructor:
           _data: $encode:initialize,$ONE_HOUR_IN_SECONDS,$MAX_DKG_SIZE,$deployer
       constructor:
-        _application: $LynxTACoChildApplication
+        _application: $TACoChildApplication
         _currency: $LynxRitualToken
         _feeRatePerSecond: 1
   - GlobalAllowList:

diff --git a/scripts/lynx/deploy_child.py b/scripts/lynx/deploy_child.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 from ape import project
+
 from deployment.constants import CONSTRUCTOR_PARAMS_DIR
 from deployment.params import Deployer
 
@@ -26,7 +27,7 @@ def main():
 
     mock_polygon_child = deployer.deploy(project.MockPolygonChild)
 
-    taco_child_application = deployer.deploy(project.LynxTACoChildApplication)
+    taco_child_application = deployer.deploy(project.TACoChildApplication)
 
     deployer.transact(mock_polygon_child.setChildApplication, taco_child_application.address)