fix: zero check

yearn · Jan 3, 2025 · e72d078 · e72d078
1 parent f707353
commit e72d078
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,8 @@ trace-contract  :; forge test -vvv --match-contract $(contract) --fork-url ${FOR
 test-test  :; forge test -vv --match-test $(test) --fork-url ${FORK_URL} --ffi
 trace-test  :; forge test -vvv --match-test $(test) --fork-url ${FORK_URL} --ffi
 
-script	:; forge script script/${script} --rpc-url ${FORK_URL} --broadcast -vvv
+run-script	:; forge script ${script} --rpc-url ${FORK_URL} -vv
+broadcast-script	:; forge script ${script} --rpc-url ${FORK_URL} -vv
 
 snapshot :; forge snapshot --fork-url ${FORK_URL} --ffi
 diff :; forge snapshot --diff --fork-url ${FORK_URL} --ffi

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/tokenized-strategy b/lib/tokenized-strategy
diff --git a/lib/yearn-vaults-v3 b/lib/yearn-vaults-v3
diff --git a/src/swappers/UniswapV3Swapper.sol b/src/swappers/UniswapV3Swapper.sol
@@ -75,7 +75,7 @@ contract UniswapV3Swapper {
         uint256 _amountIn,
         uint256 _minAmountOut
     ) internal virtual returns (uint256 _amountOut) {
-        if (_amountIn >= minAmountToSell) {
+        if (_amountIn != 0 && _amountIn >= minAmountToSell) {
             _checkAllowance(router, _from, _amountIn);
             if (_from == base || _to == base) {
                 ISwapRouter.ExactInputSingleParams memory params = ISwapRouter
@@ -138,7 +138,7 @@ contract UniswapV3Swapper {
         uint256 _amountTo,
         uint256 _maxAmountFrom
     ) internal virtual returns (uint256 _amountIn) {
-        if (_maxAmountFrom >= minAmountToSell) {
+        if (_maxAmountFrom != 0 && _maxAmountFrom >= minAmountToSell) {
             _checkAllowance(router, _from, _maxAmountFrom);
             if (_from == base || _to == base) {
                 ISwapRouter.ExactOutputSingleParams memory params = ISwapRouter
+1 −0		.gitattributes
+48 −6		.github/workflows/ci.yml
+0 −3		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+4 −3		src/Script.sol
+518 −225		src/StdAssertions.sol
+31 −12		src/StdChains.sol
+156 −15		src/StdCheats.sol
+16 −1		src/StdInvariant.sol
+25 −25		src/StdJson.sol
+244 −98		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+179 −0		src/StdToml.sol
+62 −34		src/StdUtils.sol
+7 −6		src/Test.sol
+1,516 −374		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+235 −0		src/mocks/MockERC721.sol
+44 −898		test/StdAssertions.t.sol
+118 −57		test/StdChains.t.sol
+178 −67		test/StdCheats.t.sol
+13 −11		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+27 −12		test/StdMath.t.sol
+222 −42		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+66 −36		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol
+4 −0		CHANGELOG.md
+19 −0		contracts/mocks/Base64Dirty.sol
+1 −1		contracts/package.json
+19 −10		contracts/utils/Base64.sol
+2 −2		package-lock.json
+1 −1		package.json
+11 −1		test/utils/Base64.test.js
+1 −1		README.md
+6 −6		SPECIFICATION.md
+ −		audits/Yearn V3 report Statemind.pdf
+0 −1,489		flattened/FlatBaseStrategy.sol
+0 −3,378		flattened/FlatTokenizedStrategy.sol
+2 −1		foundry.toml
+6 −4		script/Deploy.s.sol
+1 −1		src/BaseStrategy.sol
+57 −65		src/TokenizedStrategy.sol
+0 −12		src/interfaces/ITokenizedStrategy.sol
+0 −15		src/test/AccessControl.t.sol
+13 −128		src/test/Accounting.t.sol
+0 −97		src/test/CustomImplementation.t.sol
+1 −1		src/test/ERC20Std.t.sol
+0 −18		src/test/ERC4626Std.t.sol
+2 −2		src/test/handlers/StrategyHandler.sol
+2 −0		src/test/mocks/MockStorage.sol
+28 −1		.github/workflows/foundry.yaml
+2 −2		.github/workflows/lint.yaml
+5 −8		.github/workflows/test.yaml
+1 −2		.gitignore
+0 −8		.gitmodules
+1 −3		README.md
+8 −15		TECH_SPEC.md
+5 −4		ape-config.yaml
+ −		audits/Yearn V3 report Statemind.pdf
+51 −109		contracts/VaultFactory.vy
+124 −167		contracts/VaultV3.vy
+0 −10		contracts/interfaces/IVault.sol
+9 −8		contracts/interfaces/IVaultFactory.sol
+4 −5		foundry.toml
+0 −293		foundry_tests/handlers/VaultHandler.sol
+0 −18		foundry_tests/tests/ERC4626Std.t.sol
+0 −99		foundry_tests/tests/Invariants.t.sol
+0 −145		foundry_tests/utils/BaseInvariant.sol
+0 −44		foundry_tests/utils/LibAddressSet.sol
+0 −33		foundry_tests/utils/Setup.sol
+0 −1		lib/openzeppelin-contracts
+0 −1		lib/tokenized-strategy
+1 −1		package.json
+2 −3		requirements.txt
+4 −6		scripts/deploy.py
+21 −21		tests/unit/factory/test_ownership.py
+37 −24		tests/unit/factory/test_protocol_fees_config.py
+0 −437		tests/unit/vault/test_auto_allocate.py
+9 −25		tests/unit/vault/test_debt_management.py
+2 −6		tests/unit/vault/test_emergency_shutdown.py
+0 −23		tests/unit/vault/test_erc4626.py
+2 −2		tests/unit/vault/test_protocol_fees.py
+0 −40		tests/unit/vault/test_role_base_access.py
+4 −16		tests/unit/vault/test_roles.py
+2 −89		tests/unit/vault/test_shares.py
+0 −115		tests/unit/vault/test_strategy_accounting.py
+0 −36		tests/unit/vault/test_vault_accounting.py
+4 −4		yarn.lock