Deployment Tools: Constructor Parameter and Artifact Tracking + Lynx Alpha 13 Deployent

.github/workflows/main.yaml

@@ -38,23 +38,11 @@ jobs:
         with:
           cache: "pip"
           python-version: "3.8"
-      - run: pip install -r requirements.txt
+      - run: pip install -e . -r requirements.txt
 
       - name: Run Tests
         run: ape test
 
-      - name: Deploy NuCypher Token
-        run: ape run scripts/deploy_nucypher_token.py --network ethereum:local
-
-      - name: Deploy TACo Application
-        run: ape run scripts/deploy_taco_application.py --network ethereum:local
-
-      - name: Deploy Staking Escrow
-        run: ape run scripts/deploy_staking_escrow.py --network ethereum:local
-
-      - name: Deploy Subscription Manager
-        run: ape run scripts/deploy_subscription_manager.py --network ethereum:local
-
   linting:
     runs-on: ubuntu-latest
 

Pipfile

@@ -7,9 +7,11 @@ name = "pypi"
 black = "*"
 coincurve = "*"
 cryptography = "*"
-eth-ape = "*"
-# TODO eventually change to official release, issue #82, once fix is available
+eth-ape = "<=0.6.19"  # there is a bug in 0.6.20 that causes `ape test` to fail
 ape-solidity = ">=0.6.5"
+ape-etherscan = "*"
+ape-polygon = "*"
+ape-infura = "*"
 flake8 = "*"
 isort = "*"
 nucypher-core = "*"

ape-config.yaml

@@ -5,8 +5,6 @@ plugins:
   - name: solidity
   - name: polygon
   - name: ape-etherscan
-    config:
-      api_key: ${ETHERSCAN_API_KEY}
 
 dependencies:
   - name: openzeppelin
@@ -35,90 +33,6 @@ solidity:
     - "@fx-portal/contracts=fx-portal/v1.0.5"
     - "@threshold/contracts=threshold/v1.2.1"
 
-deployments:
-  polygon:
-    mainnet:
-      - contract_type: DAI
-        address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"
-      - contract_type: fx_child
-        address: "0x8397259c983751DAf40400790063935a11afa28a"
-    mumbai:
-      - contract_type: DAI
-        address: "0x001B3B4d0F3714Ca98ba10F6042DaEbF0B1B7b6F"
-      - contract_type: StakeInfo
-        address: "0xC1379866Fb0c100DCBFAb7b470009C4827D47DD8"
-      - contract_type: fx_child
-        address: "0xCf73231F28B7331BBe3124B907840A94851f9f11"
-      - contract_type: TACoChildApplication
-        address: "0x68E95C2548363Bf5856667065Bc1B89CC498969F"
-  ethereum:
-    local:
-      - nu_token_supply: 1_000_000_000
-        pre_min_authorization: 40000000000000000000000
-        pre_min_operator_seconds: 86400 # one day in seconds
-        pre_hash_algorithm: 1
-        pre_base_penalty: 2
-        pre_penalty_history_coefficient: 0
-        pre_percentage_penalty_coefficient: 100000
-        reward_duration: 604800 # one week in seconds
-        deauthorization_duration: 5184000 # 60 days in seconds
-        commitment_duration_1: 15552000 # 180 days in seconds
-        commitment_duration_2: 31104000 # 360 days in seconds
-        verify: False
-    rinkeby:
-      - nu_token: "0x78D591D90a4a768B9D2790deA465D472b6Fe0f18"
-        nu_token_supply: 1_000_000_000
-        t_staking: "0x18eFb520dA5D387982C860a64855C14C0AcADF3F"
-        work_lock: "0x0000000000000000000000000000000000000000"
-        staking_escrow: "0x6A6F917a3FF3d33d26BB4743140F205486cD6B4B"
-        pre_min_authorization: 40000000000000000000000
-        pre_min_operator_seconds: 86400 # one day in seconds
-        verify: True
-    # TODO: is there a batter way to manage multiple deployments on the same network?
-    # goerli-tapir:
-    #   - t_staking: '0x09B5065d2924De33C85F76474A89A27189402064'
-    #     pre_min_authorization: 40000000000000000000000
-    #     pre_min_operator_seconds: 86400  # one day in seconds
-    #     verify: True
-    # goerli-oryx:
-    #   - t_staking: '0xf91afFE7cf1d9c367Cb56eDd70C0941a4E8570d9'
-    #     verify: True
-    #     pre_min_authorization: 40000000000000000000000
-    #     pre_min_operator_seconds: 86400  # one day in seconds
-    goerli: # -lynx
-      - t_staking: "0x81eEefb7B1b3313C89976910096F8f1487301Bb1"
-        pre_min_authorization: 40000000000000000000000
-        pre_min_operator_seconds: 86400 # one day in seconds
-        ritual_timeout: 3600
-        max_dkg_size: 8
-        pre_application: "0x685b8Fd02aB87d8FfFff7346cB101A5cE4185bf3"
-        verify: True
-        reward_duration: 604800 # one week in seconds
-        deauthorization_duration: 5184000 # 60 days in seconds
-      - contract_type: fx_root
-        address: "0x3d1d3E34f7fB6D26245E6640E1c50710eFFf15bA"
-      - contract_type: checkpoint_manager
-        address: "0x2890bA17EfE978480615e330ecB65333b880928e"
-    mumbai:
-      - stake_info_contract: "0xC1379866Fb0c100DCBFAb7b470009C4827D47DD8"
-        max_dkg_size: 16
-        ritual_timeout: 86400 # one day in seconds
-        verify: True
-        checkpoint_manager: "0x2890bA17EfE978480615e330ecB65333b880928e"
-        fx_root: "0x3d1d3E34f7fB6D26245E6640E1c50710eFFf15bA"
-    mainnet:
-      - nu_token: "0x4fE83213D56308330EC302a8BD641f1d0113A4Cc"
-        t_staking: "0x01B67b1194C75264d06F808A921228a95C765dd7"
-        work_lock: "0xe9778E69a961e64d3cdBB34CF6778281d34667c2"
-        staking_escrow: "0xbbD3C0C794F40c4f993B03F65343aCC6fcfCb2e2"
-        pre_min_authorization: 40000000000000000000000
-        pre_min_operator_seconds: 86400 # one day in seconds
-        verify: True
-      - contract_type: fx_root
-        address: "0xfe5e5D361b2ad62c541bAb87C45a0B9B018389a2"
-      - contract_type: checkpoint_manager
-        address: "0x86e4dc95c7fbdbf52e33d563bbdb00823894c287"
-
 test:
   mnemonic: test test test test test test test test test test test junk
   number_of_accounts: 10

contracts/contracts/TestnetThresholdStaking.sol

@@ -27,6 +27,14 @@ contract TestnetThresholdStaking is Ownable {
         return 0;
     }
 
+    function authorizationIncreased(
+        address _stakingProvider,
+        uint96 _fromAmount,
+        uint96 _toAmount
+    ) external onlyOwner {
+        application.authorizationIncreased(_stakingProvider, _fromAmount, _toAmount);
+    }
+
     function setRoles(
         address _stakingProvider,
         address _owner,

contracts/contracts/coordination/GlobalAllowList.sol

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 pragma solidity ^0.8.0;
 import "@openzeppelin/contracts/access/AccessControlDefaultAdminRules.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";

contracts/contracts/coordination/IEncryptionAuthorizer.sol

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 pragma solidity ^0.8.0;
 
 interface IEncryptionAuthorizer {

contracts/contracts/coordination/TACoChildApplication.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: AGPL-3.0-or-later
 
 pragma solidity ^0.8.0;
 

contracts/contracts/testnet/LynxSet.sol

@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+import "../coordination/ITACoRootToChild.sol";
+import "../coordination/ITACoChildToRoot.sol";
+import "../coordination/TACoChildApplication.sol";
+import "../TACoApplication.sol";
+
+//       [Goerli]                              <--------->             [Mumbai]
+//
+// TACoApplication <---> MockPolygonRoot |   <deployer_account>   | MockPolygonChild <--> TACoChildApplication
+//
+
+contract MockPolygonRoot is Ownable, ITACoChildToRoot, ITACoRootToChild {
+    ITACoChildToRoot public rootApplication;
+
+    constructor(ITACoChildToRoot _rootApplication) {
+        require(
+            address(_rootApplication) != address(0),
+            "Address for root application must be specified"
+        );
+        rootApplication = _rootApplication;
+    }
+
+    function setRootApplication(ITACoChildToRoot application) external onlyOwner {
+        rootApplication = application;
+    }
+
+    function confirmOperatorAddress(address operator) external override onlyOwner {
+        rootApplication.confirmOperatorAddress(operator);
+    }
+
+    // solhint-disable-next-line no-empty-blocks
+    function updateOperator(address stakingProvider, address operator) external {}
+
+    // solhint-disable-next-line no-empty-blocks
+    function updateAuthorization(address stakingProvider, uint96 amount) external {}
+}
+
+contract MockPolygonChild is Ownable, ITACoChildToRoot, ITACoRootToChild {
+    ITACoRootToChild public childApplication;
+
+    function setChildApplication(ITACoRootToChild _childApplication) external onlyOwner {
+        childApplication = _childApplication;
+    }
+
+    function updateOperator(
+        address _stakingProvider,
+        address _operator
+    ) external override onlyOwner {
+        childApplication.updateOperator(_stakingProvider, _operator);
+    }
+
+    function updateAuthorization(
+        address _stakingProvider,
+        uint96 _amount
+    ) external override onlyOwner {
+        childApplication.updateAuthorization(_stakingProvider, _amount);
+    }
+
+    // solhint-disable-next-line no-empty-blocks
+    function confirmOperatorAddress(address _operator) external override {}
+}
+
+contract LynxTACoChildApplication is TACoChildApplication, Ownable {
+    constructor(ITACoChildToRoot _rootApplication) TACoChildApplication(_rootApplication) {}
+
+    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);
+    }
+}
+
+contract LynxStakingToken is ERC20("LynxStakingToken", "LST") {
+    constructor(uint256 _totalSupplyOfTokens) {
+        _mint(msg.sender, _totalSupplyOfTokens);
+    }
+}

contracts/threshold/ITACoChildApplication.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0-or-later
 
 pragma solidity ^0.8.0;
 

contracts/xchain/PolygonChild.sol

@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 pragma solidity ^0.8.0;
 
 import "@fx-portal/contracts/tunnel/FxBaseChildTunnel.sol";

contracts/xchain/PolygonRoot.sol

@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 pragma solidity ^0.8.0;
 
 import "@fx-portal/contracts/tunnel/FxBaseRootTunnel.sol";