diff --git a/contracts/accountants/HelathCheckAccountant.sol b/contracts/accountants/HelathCheckAccountant.sol index 098659c..8400382 100644 --- a/contracts/accountants/HelathCheckAccountant.sol +++ b/contracts/accountants/HelathCheckAccountant.sol @@ -5,7 +5,7 @@ import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; -import "@yearn-vaults/interfaces/IVault.sol"; +import {IVault} from "@yearn-vaults/interfaces/IVault.sol"; contract HealthCheckAccountant { using SafeERC20 for ERC20; diff --git a/contracts/debtAllocators/GenericDebtAllocator.sol b/contracts/debtAllocators/GenericDebtAllocator.sol index 0575924..741c20d 100644 --- a/contracts/debtAllocators/GenericDebtAllocator.sol +++ b/contracts/debtAllocators/GenericDebtAllocator.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GNU AGPLv3 pragma solidity 0.8.18; import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; diff --git a/contracts/debtAllocators/GenericDebtAllocatorFactory.sol b/contracts/debtAllocators/GenericDebtAllocatorFactory.sol index 1101fbd..0727128 100644 --- a/contracts/debtAllocators/GenericDebtAllocatorFactory.sol +++ b/contracts/debtAllocators/GenericDebtAllocatorFactory.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GNU AGPLv3 pragma solidity 0.8.18; import {GenericDebtAllocator} from "./GenericDebtAllocator.sol"; @@ -16,10 +16,8 @@ contract GenericDebtAllocatorFactory { // Original allocator to use for cloning. address public immutable original; - constructor(address _vault, address _governance) { - original = address(new GenericDebtAllocator(_vault, _governance)); - - emit NewDebtAllocator(original, _vault); + constructor() { + original = address(new GenericDebtAllocator(address(1), address(2))); } /** diff --git a/contracts/registry/Registry.sol b/contracts/registry/Registry.sol index 49f45cf..78b0f6b 100644 --- a/contracts/registry/Registry.sol +++ b/contracts/registry/Registry.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GNU AGPLv3 pragma solidity 0.8.18; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; diff --git a/contracts/registry/RegistryFactory.sol b/contracts/registry/RegistryFactory.sol index ca63da2..0ee6682 100644 --- a/contracts/registry/RegistryFactory.sol +++ b/contracts/registry/RegistryFactory.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GNU AGPLv3 pragma solidity 0.8.18; import {Registry} from "./Registry.sol"; diff --git a/contracts/registry/ReleaseRegistry.sol b/contracts/registry/ReleaseRegistry.sol index 807b3e8..bd113e5 100644 --- a/contracts/registry/ReleaseRegistry.sol +++ b/contracts/registry/ReleaseRegistry.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: GNU AGPLv3 pragma solidity 0.8.18; import {Governance} from "@periphery/utils/Governance.sol"; diff --git a/scripts/deploy_address_provider.py b/scripts/deploy_address_provider.py index 2b787f9..d29c501 100644 --- a/scripts/deploy_address_provider.py +++ b/scripts/deploy_address_provider.py @@ -56,5 +56,6 @@ def deploy_address_provider(): print("------------------") print(f"Encoded Constructor to use for verifaction {constructor.hex()}") + def main(): deploy_address_provider() diff --git a/tests/conftest.py b/tests/conftest.py index fb76ae6..16736f6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -328,11 +328,9 @@ def address_provider(deploy_address_provider): @pytest.fixture(scope="session") -def deploy_generic_debt_allocator_factory(project, vault, daddy): - def deploy_generic_debt_allocator_factory(initial_vault=vault, gov=daddy): - generic_debt_allocator_factory = gov.deploy( - project.GenericDebtAllocatorFactory, initial_vault, gov - ) +def deploy_generic_debt_allocator_factory(project, daddy): + def deploy_generic_debt_allocator_factory(gov=daddy): + generic_debt_allocator_factory = gov.deploy(project.GenericDebtAllocatorFactory) return generic_debt_allocator_factory