From 45a310f6b1494b40168cdcab4524f3042af088e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=BA=C3=B1ez?= <david@nucypher.com>
Date: Tue, 25 Jul 2023 17:09:36 +0200
Subject: [PATCH] Adapt xchain deployment script to new changes

---
 scripts/deploy_xchain_test.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/scripts/deploy_xchain_test.py b/scripts/deploy_xchain_test.py
index 06cc59b8..83521571 100644
--- a/scripts/deploy_xchain_test.py
+++ b/scripts/deploy_xchain_test.py
@@ -1,15 +1,16 @@
 from ape import accounts, config, networks, project
 
 
-def deploy_eth_contracts(deployer):
+def deploy_eth_contracts(deployer, source, child_address):
     # Connect to the Ethereum network
     with networks.ethereum.goerli.use_provider("infura"):
         DEPLOYMENTS_CONFIG = config.get_config("deployments")["ethereum"]["goerli"][0]
 
-        # Deploy the FxStateRootTunnel contract
         polygon_root = project.PolygonRoot.deploy(
             DEPLOYMENTS_CONFIG.get("checkpoint_manager"),
             DEPLOYMENTS_CONFIG.get("fx_root"),
+            source,
+            child_address,
             sender=deployer,
             publish=DEPLOYMENTS_CONFIG.get("verify"),
         )
@@ -22,32 +23,29 @@ def deploy_polygon_contracts(deployer):
     with networks.polygon.mumbai.use_provider("infura"):
         DEPLOYMENTS_CONFIG = config.get_config("deployments")["polygon"]["mumbai"][0]
 
-        # Deploy the FxStateChildTunnel contract
-        polygon_child = project.PolygonChild.deploy(
-            DEPLOYMENTS_CONFIG.get("fx_child"),
+        stake_info = project.StakeInfo.deploy(
+            [deployer.address, polygon_child.address],
             sender=deployer,
             publish=DEPLOYMENTS_CONFIG.get("verify"),
         )
-        stake_info = project.StakeInfo.deploy(
-            [deployer.address, polygon_child.address],
+
+        polygon_child = project.PolygonChild.deploy(
+            DEPLOYMENTS_CONFIG.get("fx_child"),
+            stake_info.address,
             sender=deployer,
             publish=DEPLOYMENTS_CONFIG.get("verify"),
         )
 
-        return polygon_child, stake_info
 
+        return polygon_child, stake_info
 
-def main(account_id=None):
+# TODO: Figure out better way to retrieve the TACo app contract address
+def main(taco_app, account_id=None):
     deployer = accounts.load("TGoerli")
     with accounts.use_sender(deployer):
-        root = deploy_eth_contracts(deployer)
-        child, stake_info = deploy_polygon_contracts(deployer)
+        child, _ = deploy_polygon_contracts(deployer)
+        root = deploy_eth_contracts(deployer, child.address, taco_app)
 
         # Set the root contract address in the child contract
         with networks.polygon.mumbai.use_provider("infura"):
             child.setFxRootTunnel(root.address)
-            child.setStakeInfoAddress(stake_info.address)
-
-        # Set the child contract address in the root contract
-        with networks.ethereum.goerli.use_provider("infura"):
-            root.setFxChildTunnel(child.address)