From e5cf2afc1f43892055cafe350b1f331c7d6d3cc1 Mon Sep 17 00:00:00 2001 From: Schlag <89420541+Schlagonia@users.noreply.github.com> Date: Tue, 24 Sep 2024 17:47:10 -0600 Subject: [PATCH] chore: fix interface and version (#214) --- .gitmodules | 1 + ape-config.yaml | 2 +- contracts/interfaces/IVaultFactory.sol | 13 ++++++++----- lib/tokenized-strategy | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9e1e5be8..807a3935 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,4 @@ [submodule "lib/tokenized-strategy"] path = lib/tokenized-strategy url = https://github.com/yearn/tokenized-strategy + branch = v3.0.3 \ No newline at end of file diff --git a/ape-config.yaml b/ape-config.yaml index 2500d557..03d10155 100644 --- a/ape-config.yaml +++ b/ape-config.yaml @@ -12,7 +12,7 @@ dependencies: ref: 4.9.5 - name: tokenized-strategy github: yearn/tokenized-strategy - ref: v3.0.2 + ref: v3.0.3 config_override: contracts_folder: src diff --git a/contracts/interfaces/IVaultFactory.sol b/contracts/interfaces/IVaultFactory.sol index 880e4941..660cb799 100644 --- a/contracts/interfaces/IVaultFactory.sol +++ b/contracts/interfaces/IVaultFactory.sol @@ -16,14 +16,17 @@ interface IVaultFactory { event UpdateCustomProtocolFee(address vault, uint16 newCustomProtocolFee); event RemovedCustomProtocolFee(address vault); event FactoryShutdown(); - event NewPendingGovernance(address newPendingGovernance); - event UpdateGovernance(address newGovernance); + event UpdatePendingGovernance(address newPendingGovernance); + event GovernanceTransferred( + address previousGovernance, + address newGovernance + ); function shutdown() external view returns (bool); function governance() external view returns (address); - function pending_governance() external view returns (address); + function pendingGovernance() external view returns (address); function name() external view returns (string memory); @@ -65,7 +68,7 @@ interface IVaultFactory { function shutdown_factory() external; - function set_governance(address new_governance) external; + function transferGovernance(address new_governance) external; - function accept_governance() external; + function acceptGovernance() external; } diff --git a/lib/tokenized-strategy b/lib/tokenized-strategy index 0d90dee1..6e12ce08 160000 --- a/lib/tokenized-strategy +++ b/lib/tokenized-strategy @@ -1 +1 @@ -Subproject commit 0d90dee170d53a0e04af3ff41d2f7a4f3ac395bd +Subproject commit 6e12ce08584b49c7560227e94810d2f0e3dec8b2