From 098402e342e74026d7a9ed636bd7765a5c09812e Mon Sep 17 00:00:00 2001 From: Schlagonia Date: Wed, 25 Oct 2023 15:58:26 -0600 Subject: [PATCH 1/3] chore: update license --- .gitmodules | 6 +----- lib/tokenized-strategy-periphery | 1 - src/Strategy.sol | 2 +- src/interfaces/IStrategyInterface.sol | 2 +- src/periphery/StrategyAprOracle.sol | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 160000 lib/tokenized-strategy-periphery diff --git a/.gitmodules b/.gitmodules index 624adfd9..2312e103 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,8 +9,4 @@ [submodule "lib/tokenized-strategy"] path = lib/tokenized-strategy url = https://github.com/yearn/tokenized-strategy - branch = v3.0.1 -[submodule "lib/tokenized-strategy-periphery"] - path = lib/tokenized-strategy-periphery - url = https://github.com/yearn/tokenized-strategy-periphery - branch = master \ No newline at end of file + branch = v3.0.1 \ No newline at end of file diff --git a/lib/tokenized-strategy-periphery b/lib/tokenized-strategy-periphery deleted file mode 160000 index 4b364833..00000000 --- a/lib/tokenized-strategy-periphery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b364833598da20a707fe70bbd039b2cf984cf79 diff --git a/src/Strategy.sol b/src/Strategy.sol index d6b46c84..4f6b3c64 100644 --- a/src/Strategy.sol +++ b/src/Strategy.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: AGPL-3.0 pragma solidity 0.8.18; import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol"; diff --git a/src/interfaces/IStrategyInterface.sol b/src/interfaces/IStrategyInterface.sol index de2f38cc..49799bac 100644 --- a/src/interfaces/IStrategyInterface.sol +++ b/src/interfaces/IStrategyInterface.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: AGPL-3.0 pragma solidity 0.8.18; import {IStrategy} from "@tokenized-strategy/interfaces/IStrategy.sol"; diff --git a/src/periphery/StrategyAprOracle.sol b/src/periphery/StrategyAprOracle.sol index 6b9be9e4..ac2ae6e0 100644 --- a/src/periphery/StrategyAprOracle.sol +++ b/src/periphery/StrategyAprOracle.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0 +// SPDX-License-Identifier: AGPL-3.0 pragma solidity 0.8.18; import {AprOracleBase} from "@periphery/AprOracle/AprOracleBase.sol"; From 7e6406bef6b6c7b17a3625283a71849e9746ba06 Mon Sep 17 00:00:00 2001 From: Schlagonia Date: Wed, 25 Oct 2023 15:59:43 -0600 Subject: [PATCH 2/3] forge install: tokenized-strategy-periphery 81a47eb90460e0ea2c7ca6dbe661f7b330f26572 --- .gitmodules | 5 ++++- lib/tokenized-strategy-periphery | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 lib/tokenized-strategy-periphery diff --git a/.gitmodules b/.gitmodules index 2312e103..dc26cae3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,7 @@ [submodule "lib/tokenized-strategy"] path = lib/tokenized-strategy url = https://github.com/yearn/tokenized-strategy - branch = v3.0.1 \ No newline at end of file + branch = v3.0.1 +[submodule "lib/tokenized-strategy-periphery"] + path = lib/tokenized-strategy-periphery + url = https://github.com/yearn/tokenized-strategy-periphery diff --git a/lib/tokenized-strategy-periphery b/lib/tokenized-strategy-periphery new file mode 160000 index 00000000..81a47eb9 --- /dev/null +++ b/lib/tokenized-strategy-periphery @@ -0,0 +1 @@ +Subproject commit 81a47eb90460e0ea2c7ca6dbe661f7b330f26572 From 2f4d3bc2634f32277bc4cb086bb8b4ddd6edcf49 Mon Sep 17 00:00:00 2001 From: Schlagonia Date: Wed, 25 Oct 2023 16:00:21 -0600 Subject: [PATCH 3/3] feat: update periphery --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index dc26cae3..624adfd9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,4 @@ [submodule "lib/tokenized-strategy-periphery"] path = lib/tokenized-strategy-periphery url = https://github.com/yearn/tokenized-strategy-periphery + branch = master \ No newline at end of file