feat: clean zapper with comments

astrodevs-labs · Feb 1, 2024 · 5fde7b0 · 5fde7b0
1 parent 150d3e0
commit 5fde7b0
Show file tree

Hide file tree

Showing 11 changed files with 193 additions and 99 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,18 @@
-[submodule "contracts/lib/openzeppelin-contracts"]
-	path = contracts/lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "contracts/lib/solmate"]
-	path = contracts/lib/solmate
-	url = https://github.com/transmissions11/solmate
 [submodule "contracts/lib/forge-std"]
 	path = contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "contracts/lib/solidity-generators"]
 	path = contracts/lib/solidity-generators
 	url = https://github.com/mds1/solidity-generators
+[submodule "contracts/lib/solady"]
+	path = contracts/lib/solady
+	url = https://github.com/Vectorized/solady
+[submodule "contracts/lib/solmate"]
+	path = contracts/lib/solmate
+	url = https://github.com/transmissions11/solmate
 [submodule "contracts/lib/Warlord"]
 	path = contracts/lib/Warlord
 	url = https://github.com/0xtekgrinder/Warlord
+[submodule "contracts/lib/openzeppelin-contracts"]
+	path = contracts/lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/contracts/lib/Warlord b/contracts/lib/Warlord
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/lib/openzeppelin-contracts b/contracts/lib/openzeppelin-contracts
diff --git a/contracts/lib/solady b/contracts/lib/solady
diff --git a/contracts/lib/solmate b/contracts/lib/solmate
diff --git a/contracts/src/Vault.sol b/contracts/src/Vault.sol
@@ -6,7 +6,7 @@ import { SafeTransferLib } from "solmate/utils/SafeTransferLib.sol";
 import { ReentrancyGuard } from "solmate/utils/ReentrancyGuard.sol";
 import { IMinter } from "warlord/interfaces/IMinter.sol";
 import { IStaker } from "warlord/interfaces/IStaker.sol";
-import { ERC4626 } from "solmate/mixins/ERC4626.sol";
+import { ERC4626 } from "solmate/tokens/ERC4626.sol";
 import { ERC20 } from "solmate/tokens/ERC20.sol";
 import { ISwapper } from "./interfaces/ISwapper.sol";
 import { AOperator } from "./abstracts/AOperator.sol";

diff --git a/contracts/src/Zap.sol b/contracts/src/Zap.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.20;
 
 import { ReentrancyGuard } from "solmate/utils/ReentrancyGuard.sol";
-import { ERC4626 } from "solmate/mixins/ERC4626.sol";
+import { ERC4626 } from "solmate/tokens/ERC4626.sol";
 import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol";
 import { IMinter } from "warlord/interfaces/IMinter.sol";