diff --git a/deployment/constructor_params/lynx/child.yml b/deployment/constructor_params/lynx/child.yml index c0cb9626..b61be945 100644 --- a/deployment/constructor_params/lynx/child.yml +++ b/deployment/constructor_params/lynx/child.yml @@ -14,21 +14,23 @@ constants: contracts: - MockPolygonChild - LynxTACoChildApplication: - _rootApplication: $MockPolygonChild - _minimumAuthorization: $FORTY_THOUSAND_TOKENS_IN_WEI_UNITS - - TransparentUpgradeableProxy: - _logic: $LynxTACoChildApplication - initialOwner: $deployer - _data: 0x + proxy: + wrap_container: TACoChildApplication + constructor: + _rootApplication: $MockPolygonChild + _minimumAuthorization: $FORTY_THOUSAND_TOKENS_IN_WEI_UNITS - LynxRitualToken: - _totalSupplyOfTokens: $TEN_MILLION_TOKENS_IN_WEI_UNITS + constructor: + _totalSupplyOfTokens: $TEN_MILLION_TOKENS_IN_WEI_UNITS - Coordinator: - _application: $TransparentUpgradeableProxy:LynxTACoChildApplication - _timeout: $ONE_HOUR_IN_SECONDS - _maxDkgSize: 4 - _admin: $deployer - _currency: $LynxRitualToken - _feeRatePerSecond: 1 + constructor: + _application: $proxy:LynxTACoChildApplication + _timeout: $ONE_HOUR_IN_SECONDS + _maxDkgSize: 4 + _admin: $deployer + _currency: $LynxRitualToken + _feeRatePerSecond: 1 - GlobalAllowList: - _coordinator: $Coordinator - _admin: $deployer + constructor: + _coordinator: $Coordinator + _admin: $deployer diff --git a/deployment/constructor_params/lynx/root.yml b/deployment/constructor_params/lynx/root.yml index 06745488..ef37d50e 100644 --- a/deployment/constructor_params/lynx/root.yml +++ b/deployment/constructor_params/lynx/root.yml @@ -17,19 +17,19 @@ constants: contracts: - LynxStakingToken: - _totalSupplyOfTokens: $TEN_MILLION_TOKENS_IN_WEI_UNITS + constructor: + _totalSupplyOfTokens: $TEN_MILLION_TOKENS_IN_WEI_UNITS - TestnetThresholdStaking - TACoApplication: - _token: $LynxStakingToken - _tStaking: $TestnetThresholdStaking - _minimumAuthorization: $FORTY_THOUSAND_TOKENS_IN_WEI_UNITS - _minOperatorSeconds: $IN_SECONDS_1_HOUR - _rewardDuration: $IN_SECONDS_7_DAYS - _deauthorizationDuration: $IN_SECONDS_60_DAYS - _commitmentDurationOptions: [$IN_SECONDS_182_DAYS, $IN_SECONDS_364_DAYS] - - TransparentUpgradeableProxy: - _logic: $TACoApplication - initialOwner: $deployer - _data: 0x + proxy: + constructor: + _token: $LynxStakingToken + _tStaking: $TestnetThresholdStaking + _minimumAuthorization: $FORTY_THOUSAND_TOKENS_IN_WEI_UNITS + _minOperatorSeconds: $IN_SECONDS_1_HOUR + _rewardDuration: $IN_SECONDS_7_DAYS + _deauthorizationDuration: $IN_SECONDS_60_DAYS + _commitmentDurationOptions: [$IN_SECONDS_182_DAYS, $IN_SECONDS_364_DAYS] - MockPolygonRoot: - _rootApplication: $TransparentUpgradeableProxy:TACoApplication + constructor: + _rootApplication: $proxy:TACoApplication diff --git a/scripts/lynx/deploy_child.py b/scripts/lynx/deploy_child.py index fb2718a0..6ad16d84 100644 --- a/scripts/lynx/deploy_child.py +++ b/scripts/lynx/deploy_child.py @@ -1,7 +1,8 @@ #!/usr/bin/python3 from ape import project -from deployment.constants import CONSTRUCTOR_PARAMS_DIR, OZ_DEPENDENCY + +from deployment.constants import CONSTRUCTOR_PARAMS_DIR from deployment.params import Deployer VERIFY = False @@ -25,26 +26,19 @@ def main(): deployer = Deployer.from_yaml(filepath=CONSTRUCTOR_PARAMS_FILEPATH, verify=VERIFY) mock_polygon_child = deployer.deploy(project.MockPolygonChild) - - taco_implementation = deployer.deploy(project.LynxTACoChildApplication) - - proxy = deployer.deploy(OZ_DEPENDENCY.TransparentUpgradeableProxy) - taco_child_application = deployer.proxy(project.TACoChildApplication, proxy) - + taco_child_application = deployer.deploy(project.LynxTACoChildApplication) deployer.transact(mock_polygon_child.setChildApplication, taco_child_application.address) ritual_token = deployer.deploy(project.LynxRitualToken) coordinator = deployer.deploy(project.Coordinator) - deployer.transact(taco_child_application.initialize, coordinator.address) global_allow_list = deployer.deploy(project.GlobalAllowList) deployments = [ mock_polygon_child, - taco_implementation, # implementation (contract name is different than proxy contract) - taco_child_application, # proxy + taco_child_application, ritual_token, coordinator, global_allow_list, diff --git a/scripts/lynx/deploy_root.py b/scripts/lynx/deploy_root.py index c6a56f18..642accf1 100644 --- a/scripts/lynx/deploy_root.py +++ b/scripts/lynx/deploy_root.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 from ape import project -from deployment.constants import CONSTRUCTOR_PARAMS_DIR, OZ_DEPENDENCY +from deployment.constants import CONSTRUCTOR_PARAMS_DIR from deployment.params import Deployer VERIFY = False @@ -27,10 +27,7 @@ def main(): mock_threshold_staking = deployer.deploy(project.TestnetThresholdStaking) - _ = deployer.deploy(project.TACoApplication) - - proxy = deployer.deploy(OZ_DEPENDENCY.TransparentUpgradeableProxy) - taco_application = deployer.proxy(project.TACoApplication, proxy) + taco_application = deployer.deploy(project.TACoApplication) deployer.transact(mock_threshold_staking.setApplication, taco_application.address)