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

Add erc4626 #1170

Merged
merged 116 commits into from
Feb 5, 2025
Merged
Changes from 1 commit
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
82b3173
start erc4626
andrew-fleming Sep 26, 2024
f08dd48
add fns from interface
andrew-fleming Sep 27, 2024
c558c59
start business logic
andrew-fleming Oct 1, 2024
0b572e5
add mul_div and tests
andrew-fleming Oct 1, 2024
3cadd55
simplify math
andrew-fleming Oct 1, 2024
f66bce4
add fix me comments
andrew-fleming Oct 1, 2024
5d7b1d9
fix fmt
andrew-fleming Oct 1, 2024
33bd0d4
fix fmt
andrew-fleming Oct 1, 2024
ce22c2f
add convert_to logic, add metadata impl
andrew-fleming Oct 2, 2024
4fefde2
reexports
andrew-fleming Oct 2, 2024
80c4013
add erc4626 mock
andrew-fleming Oct 2, 2024
7e4177f
add erc4626 mock
andrew-fleming Oct 2, 2024
3def693
start erc4626 tests
andrew-fleming Oct 2, 2024
77fdfa6
comment out mods and tests to improve performance
andrew-fleming Oct 2, 2024
dc66804
add offset config in mock
andrew-fleming Oct 3, 2024
b05f57e
add overflow assertion and test
andrew-fleming Oct 3, 2024
ea3bf06
add power fn
andrew-fleming Oct 6, 2024
f5ce03b
add erc20reentrant mock
andrew-fleming Oct 6, 2024
e70061d
fix interface fns
andrew-fleming Oct 6, 2024
ca52772
fix logic, add power
andrew-fleming Oct 6, 2024
8072770
add starting tests-no assets, no shares
andrew-fleming Oct 6, 2024
7d2a3c1
fix fmt
andrew-fleming Oct 6, 2024
a45c8dc
clean up power fn
andrew-fleming Oct 6, 2024
bb1cdc2
simplify operation
andrew-fleming Oct 6, 2024
f2681e5
add comments, fix visibility
andrew-fleming Oct 6, 2024
f401df1
move fn, remove tests
andrew-fleming Oct 6, 2024
4bdde8d
add test_math mod
andrew-fleming Oct 6, 2024
ccc8784
add mint to mock vault construction
andrew-fleming Oct 8, 2024
87a84ab
add full vault tests
andrew-fleming Oct 8, 2024
501d7b9
fix fmt
andrew-fleming Oct 8, 2024
ee222f5
fix assertions
andrew-fleming Oct 8, 2024
970cb75
add full vault redeem tests
andrew-fleming Oct 8, 2024
39b205c
fix fmt
andrew-fleming Oct 8, 2024
5af5b8b
fix fmt
andrew-fleming Oct 8, 2024
69c4831
fix conflicts
andrew-fleming Oct 8, 2024
b735b5d
fix fmt
andrew-fleming Oct 8, 2024
43440d0
move erc4626 tests to erc4626 dir
andrew-fleming Oct 8, 2024
56cea65
add transfer assertion
andrew-fleming Oct 9, 2024
0870930
add reentrancy tests
andrew-fleming Oct 11, 2024
65dddfc
expose burn in mock
andrew-fleming Oct 11, 2024
bded58f
tidy up tests
andrew-fleming Oct 11, 2024
fd4d146
add default decimals mock
andrew-fleming Oct 11, 2024
2bf3aac
fix deploy fn names
andrew-fleming Oct 11, 2024
9c7243f
improve helper fn name
andrew-fleming Oct 11, 2024
bb3a6b0
fix fmt
andrew-fleming Oct 11, 2024
c8a9dfa
add comments, remove unused dep
andrew-fleming Oct 19, 2024
385118e
update branch
andrew-fleming Oct 19, 2024
bc88cf8
fix conflicts
andrew-fleming Oct 19, 2024
1d14afc
fix conflicts
andrew-fleming Oct 19, 2024
acc2047
fix fmt
andrew-fleming Oct 19, 2024
2e368fd
update spdx
andrew-fleming Oct 19, 2024
c4f565e
fix conflicts
andrew-fleming Nov 20, 2024
c343716
add reqs to mul_div, fix spdx
andrew-fleming Nov 21, 2024
0e10817
remove duplicate erc4626 in votes
andrew-fleming Nov 21, 2024
cbdd70a
add/fix in-code docs
andrew-fleming Nov 21, 2024
970d621
fix param name
andrew-fleming Nov 22, 2024
1418543
fix comments
andrew-fleming Nov 25, 2024
a10b28c
add multiple tx tests
andrew-fleming Nov 25, 2024
e67d312
fix err msgs
andrew-fleming Nov 25, 2024
ed727df
fix comments, fix test
andrew-fleming Nov 25, 2024
b7fb9de
add note to power
andrew-fleming Nov 26, 2024
44055bd
use math:: prefix in tests
andrew-fleming Nov 26, 2024
8d8e066
improve u256_mul_div
andrew-fleming Nov 26, 2024
450efa4
remove unused var
andrew-fleming Nov 27, 2024
d912c6d
remove line
andrew-fleming Nov 27, 2024
0cd10da
improve var name
andrew-fleming Nov 27, 2024
3ef163f
add changelog entries
andrew-fleming Nov 29, 2024
4fcdd0c
Merge branch 'main' into add-erc4626
andrew-fleming Nov 29, 2024
c8b7161
fix version in spdx
andrew-fleming Nov 29, 2024
1c221a5
Apply suggestions from code review
andrew-fleming Dec 5, 2024
ed01a88
fix conflicts
andrew-fleming Dec 9, 2024
58d26be
use corelib pow, remove power fn
andrew-fleming Dec 9, 2024
c699dc4
add zero addr test
andrew-fleming Dec 9, 2024
0ec51cf
fix max and preview comments
andrew-fleming Dec 10, 2024
f84d7d1
Apply suggestions from code review
andrew-fleming Dec 10, 2024
dd81898
fix conflicts, fmt
andrew-fleming Dec 10, 2024
960f338
improve interface fmt
andrew-fleming Dec 10, 2024
b147fb4
re-enable cairo-coverage in CI
andrew-fleming Dec 11, 2024
978ac98
tmp lower codecov coverage
andrew-fleming Dec 11, 2024
533f7ba
tmp increase threshold
andrew-fleming Dec 11, 2024
84e3681
Apply suggestions from code review
andrew-fleming Dec 18, 2024
9a6a14a
fix comment
andrew-fleming Dec 18, 2024
9c69ca2
add LimitConfig comments
andrew-fleming Dec 18, 2024
0c3f8e0
Apply suggestions from code review
andrew-fleming Dec 18, 2024
8852efe
add HasComponent to traits
andrew-fleming Dec 18, 2024
8729faa
fix fmt
andrew-fleming Dec 18, 2024
fc09ba9
fix comments
andrew-fleming Dec 19, 2024
cf24a40
fix interface comments
andrew-fleming Dec 19, 2024
6462c6c
tidy up mock
andrew-fleming Dec 23, 2024
8722e2d
fix fmt
andrew-fleming Dec 23, 2024
2de96c5
Merge branch 'main' into add-erc4626
andrew-fleming Dec 23, 2024
4eb0b83
add fees comment to mock
andrew-fleming Dec 23, 2024
894e43b
improve comments
andrew-fleming Dec 23, 2024
379f874
add comments to hook fns
andrew-fleming Dec 23, 2024
3e8f237
fix fmt
andrew-fleming Dec 24, 2024
02206f0
improve FeeConfigTrait NOTE
andrew-fleming Dec 24, 2024
4263919
fix fmt
andrew-fleming Dec 24, 2024
31634e9
Apply suggestions from code review
andrew-fleming Jan 6, 2025
db43725
fix fmt
andrew-fleming Jan 6, 2025
624b5c0
remove unused vars
andrew-fleming Jan 6, 2025
aed67aa
Apply suggestions from code review
andrew-fleming Jan 9, 2025
162a788
fix conflicts
andrew-fleming Jan 22, 2025
637cd99
improve docs
andrew-fleming Jan 22, 2025
aecf36c
improve docs
andrew-fleming Jan 22, 2025
d7fb6c4
return max_limit or assets_bal, whichever is less
andrew-fleming Jan 23, 2025
3816021
improve docs
andrew-fleming Jan 23, 2025
302ef1e
improve mock
andrew-fleming Jan 23, 2025
e881876
fix fmt
andrew-fleming Jan 23, 2025
6b5e1d3
improve limit docs
andrew-fleming Jan 24, 2025
a3e9c0f
fix fmt
andrew-fleming Jan 24, 2025
76e5e7a
improve comments
andrew-fleming Jan 24, 2025
04558ee
Apply suggestions from code review
andrew-fleming Jan 27, 2025
f11c119
Update packages/token/src/erc20/extensions/erc4626/erc4626.cairo
andrew-fleming Jan 27, 2025
9fa71cf
remove trailing space
andrew-fleming Jan 27, 2025
5dd7190
fix fmt
andrew-fleming Jan 27, 2025
3cddacf
fix comments
andrew-fleming Jan 28, 2025
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
Next Next commit
fix fmt
  • Loading branch information
andrew-fleming committed Jan 23, 2025
commit e8818763375376a2e8302b8a3df40f2a3dcfc8d5
2 changes: 1 addition & 1 deletion packages/test_common/src/mocks/erc4626.cairo
Original file line number Diff line number Diff line change
@@ -226,8 +226,8 @@ pub mod ERC4626LimitsMock {
/// DO NOT USE IN PRODUCTION
#[starknet::contract]
pub mod ERC4626FeesMock {
use openzeppelin_token::erc20::extensions::erc4626::ERC4626Component;
use openzeppelin_token::erc20::extensions::erc4626::DefaultConfig;
use openzeppelin_token::erc20::extensions::erc4626::ERC4626Component;
use openzeppelin_token::erc20::extensions::erc4626::ERC4626Component::FeeConfigTrait;
use openzeppelin_token::erc20::extensions::erc4626::ERC4626Component::InternalTrait as ERC4626InternalTrait;
use openzeppelin_token::erc20::extensions::erc4626::ERC4626DefaultLimits;