Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERC4626 #3171

Merged
merged 39 commits into from
Jun 2, 2022
Merged

ERC4626 #3171

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4f1e397
IERC4626
Amxx Feb 7, 2022
7bf3143
intitial ERC4626 implementation
Amxx Feb 7, 2022
a0363e5
fix convertion in case of decimals missmatch
Amxx Feb 7, 2022
8cbf623
fix bug
Amxx Feb 18, 2022
d84975b
Merge branch 'master' into feature/ERC4626
Amxx Feb 21, 2022
2f33819
ERC4626 testing
Amxx Feb 21, 2022
51ccbf8
update ERC4626 interface to match the current state of the ERC
Amxx Feb 21, 2022
b1c5367
fix lint
Amxx Feb 21, 2022
e730222
slither
Amxx Feb 21, 2022
7fc3633
more ERC4626 testing
Amxx Feb 21, 2022
b9709dc
more testing
Amxx Mar 10, 2022
fac4303
fix and document reentrancy risk
Amxx Mar 10, 2022
3931537
use Math.mulDiv
Amxx May 5, 2022
370de87
safe muldiv with rouding direction
Amxx May 5, 2022
a9affd7
Debug + simplify muldiv
Amxx May 5, 2022
3520d7f
minor improvement
Amxx May 5, 2022
f73f183
cleanup testing
Amxx May 5, 2022
3d1899f
fix lint
Amxx May 5, 2022
222bb7f
Merge branch 'master' into feature/ERC4626
Amxx May 6, 2022
2fda29a
add changelog entry
Amxx May 6, 2022
33d2481
cleanup
Amxx May 8, 2022
f16dc72
Merge branch 'master' into feature/ERC4626
Amxx May 8, 2022
d27b743
Apply suggestions from code review
Amxx May 12, 2022
c41c94b
fix muldiv tests
Amxx May 12, 2022
5673259
Merge branch 'master' into feature/ERC4626
Amxx May 16, 2022
5a86254
slither false positive silence + documentation
Amxx May 19, 2022
baa4d01
_deposit and _withdraw private functions
Amxx May 20, 2022
b8cba33
private functions renaming
Amxx May 20, 2022
32a2b9b
lint
Amxx May 20, 2022
a5d5fb4
documentation
Amxx May 23, 2022
fe5cfe4
rename ERC4626 to ERC20TokenizedVault
Amxx May 23, 2022
aa9b2f8
gas optimisation in muldiv
Amxx May 30, 2022
477f675
lint
Amxx May 30, 2022
82c7386
Apply suggestions from code review
Amxx May 31, 2022
e8947db
address issues from the PR
Amxx May 31, 2022
62f1a63
try to improve the symetry for broken vaults (>0 shares & 0 assets)
Amxx May 31, 2022
bdd9c0d
Revert systematic _sanity check & improve maxDeposit
Amxx Jun 1, 2022
9a6ab42
fix lint
Amxx Jun 1, 2022
cab514a
lint
frangio Jun 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
lint
  • Loading branch information
frangio committed Jun 1, 2022
commit cab514ad27dfdab25100c1ea0a9b15deaf7b4767
6 changes: 3 additions & 3 deletions test/token/ERC20/extensions/ERC20TokenizedVault.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ contract('ERC20TokenizedVault', function (accounts) {
// Cannot deposit more than 0
await expectRevert.unspecified(this.vault.previewDeposit(parseToken(1)));
await expectRevert(
this.vault.deposit(parseToken(1), recipient, { from: holder }),
'ERC20TokenizedVault: deposit more than max',
);
this.vault.deposit(parseToken(1), recipient, { from: holder }),
'ERC20TokenizedVault: deposit more than max',
);
});

it('mint', async function () {
Expand Down