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.

Sign up for GitHub

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

Jump to bottom

Feature/multi coin withdraw #50

Open
wants to merge 176 commits into
base: develop
Choose a base branch
from
Open

Feature/multi coin withdraw #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
02af594
New rinkeby deployment
pash7ka Mar 17, 2020
a81f96d
Add extracted ABI to repository
pash7ka Mar 17, 2020
2dc3091
Merge feature/funds
pash7ka Mar 23, 2020
356891d
Update Rinkeby deployment
pash7ka Mar 23, 2020
762711d
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 23, 2020
1eb911c
Upgrade Rinkeby deployment
pash7ka Mar 23, 2020
41e0d07
Merge remote-tracking branch 'origin/feature/funds' into feature/defi
pash7ka Mar 24, 2020
3bdf842
Update Rinkeby deployment
pash7ka Mar 24, 2020
6e31e0c
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 25, 2020
2c1cc1e
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 25, 2020
bd22f5b
Update rinkeby deployment
pash7ka Mar 26, 2020
f0d7d65
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 26, 2020
dfcfb11
Update Rinkeby deployment
pash7ka Mar 26, 2020
46bd651
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 26, 2020
a49484c
Fix lProposals was not updated
pash7ka Mar 26, 2020
95c7c34
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 26, 2020
19f5f8e
Upgrade Rinkeby deployment
pash7ka Mar 26, 2020
7037bbe
Upgrade Rinkeby deployment
pash7ka Mar 26, 2020
8c023ac
Prepare for Compound integration
pash7ka Mar 31, 2020
2da21e2
Merge branch 'feature/funds' into feature/defi
pash7ka Mar 31, 2020
6c10992
Compound integration (wip)
pash7ka Mar 31, 2020
2ea713f
Upgrade Rinkeby deployment
pash7ka Mar 31, 2020
31deab6
fix test
pash7ka Mar 31, 2020
63b6ad4
cDAI Proxy (wip)
pash7ka Apr 7, 2020
b2316b4
cDAI Proxy (wip)
pash7ka Apr 8, 2020
780732e
Defi Module implementation (wip)
pash7ka Apr 15, 2020
545a59f
Solve negative integers problem
pash7ka Apr 15, 2020
ea49517
Add limits to loan proposals
pash7ka Apr 16, 2020
a614040
Test for proposal limits (wip)
pash7ka Apr 16, 2020
8ef315b
Add more test for proposal limits (wip)
pash7ka Apr 16, 2020
2f90ed4
Compound module (wip)
pash7ka Apr 16, 2020
0ee395f
Compound Module integration (wip)
pash7ka Apr 16, 2020
5ba75d2
Extract limits to separate contract
pash7ka Apr 16, 2020
7992c5c
fix test
pash7ka Apr 16, 2020
aacf90e
Add ILoanLimitsModule interface
pash7ka Apr 16, 2020
25f1983
Fix old tests and update ABIs
pash7ka Apr 16, 2020
f1eca2d
Fix Module test
pash7ka Apr 16, 2020
a9c961f
Enable open proposals limit
pash7ka Apr 16, 2020
b04d292
More test & typo fixes
pash7ka Apr 16, 2020
0b4c7ab
Add contract size plugin
pash7ka Apr 17, 2020
05bb931
LoanModule separation (wip)
pash7ka Apr 20, 2020
4375c56
LoanModule separation (wip)
pash7ka Apr 20, 2020
33ff616
LoanModule - fix stack too deep errors
pash7ka Apr 20, 2020
e541fce
Fix wrong module name
pash7ka Apr 20, 2020
1d4d2c3
ABI and types update
pash7ka Apr 20, 2020
98ec1d8
Fix tests (wip)
pash7ka Apr 21, 2020
bc2fb03
Fix tests(wip)
pash7ka Apr 21, 2020
e1a0c93
Dirty fix for repayPTK error
pash7ka Apr 21, 2020
43f524c
More fixes (wip)
pash7ka Apr 21, 2020
9ca36e9
Fix linter errors
pash7ka Apr 21, 2020
4068444
Update readme
pash7ka Apr 21, 2020
60ff405
Update ABI and types
pash7ka Apr 21, 2020
724acb6
Fix funds module test
pash7ka Apr 21, 2020
b8acf13
Fix test errors
pash7ka Apr 21, 2020
f5f57bd
Merge Module.ts fix from fixes-for-certik branch
pash7ka Apr 21, 2020
7b47043
Merge remote-tracking branch 'origin/develop' into feature/defi
pash7ka Apr 22, 2020
4db28e4
Change claimDistributions methods so that toDistribution parameter do…
pash7ka Apr 22, 2020
b2bbf79
DefiModule interface update
pash7ka Apr 22, 2020
685c9de
Add DefiFundsModule
pash7ka Apr 22, 2020
61af726
Fix tests
pash7ka Apr 22, 2020
11d86a1
Fix tests & OpenZeppelin deployment config
pash7ka Apr 22, 2020
9cfa021
Add CErc20 Stub and improve TestnetCErc20Proxy
pash7ka Apr 22, 2020
c484a1d
Fix CErc20Stub and test
pash7ka Apr 23, 2020
18f9f94
Fix CErc20Stub and test
pash7ka Apr 23, 2020
a755540
Fix linter
pash7ka Apr 23, 2020
83ac8ff
tests (wip)
pash7ka Apr 23, 2020
4ec3e9c
test fixed
pash7ka Apr 23, 2020
c249034
Improve initialization of CompoundModule
pash7ka Apr 23, 2020
a54266a
Fix linter
pash7ka Apr 23, 2020
8155854
Fix LoanModule test
pash7ka Apr 24, 2020
272df2d
Add test to DefiFundsModule
pash7ka Apr 24, 2020
5c51a57
Add test for TestnetCErc20Proxy
pash7ka Apr 24, 2020
0e3e099
Create new OZ deployment
pash7ka Apr 24, 2020
bbb3bdc
Defi Module distributions description
pash7ka Apr 27, 2020
fd26a52
Add Compound distribution diagram
pash7ka Apr 27, 2020
84660cf
Update compound distribution diagram
pash7ka Apr 27, 2020
ce233a0
Fix linter
pash7ka Apr 27, 2020
a9c8273
Fix test
pash7ka Apr 27, 2020
fa5d395
Fix test
pash7ka Apr 27, 2020
e6023f5
Update rinkeby deployment
pash7ka Apr 27, 2020
558e290
Update deployment sequence
pash7ka Apr 27, 2020
fe0a5fb
Fix error in deployed addresses
pash7ka Apr 27, 2020
782a3e7
Fix addresses of DAI and cDAI to be checksummed
pash7ka Apr 27, 2020
5ed44a3
Rename DefiFundsModule back to FundsModule in the list of module addr…
pash7ka Apr 28, 2020
f140580
Update diagram
pash7ka Apr 28, 2020
269d25d
Update LoanLimitModule to export all limits at once and emit an event…
pash7ka Apr 28, 2020
d2ec8c8
Move DAI transfer from CompoundModule to DefiFundsModule, so that onl…
pash7ka Apr 28, 2020
de7ef40
Update Rinkeby deployment
pash7ka Apr 28, 2020
a4c602b
Fix typo in comment
pash7ka Apr 28, 2020
8ce8bd6
Make module names internal to save contract size and gas
pash7ka Apr 28, 2020
23a3ec1
Add test for LiquidityModule with CompoundModule
pash7ka Apr 29, 2020
cfe31af
Add additional check for DAI transfer success
pash7ka Apr 29, 2020
3b6ce64
Fix problem with rounding on cDAI
pash7ka Apr 29, 2020
98e579a
Update Rinkeby deployment
pash7ka Apr 29, 2020
29ab2e0
Fix bug that interest claim did not decrease avilable interest
pash7ka Apr 30, 2020
440fb79
Update rinkeby deployment
pash7ka Apr 30, 2020
6bcc513
RAY module
pash7ka May 1, 2020
2bad870
Add RAY stub
pash7ka May 1, 2020
24b0f6d
Remove fee calculation, because it is not needed, see https://github.…
pash7ka May 4, 2020
4748114
RAYStub test and fixes
pash7ka May 4, 2020
9eafcf8
Fix test
pash7ka May 4, 2020
4c7153e
Update ABI and types
pash7ka May 4, 2020
b0b5a80
Rename CompoundModule.ts to DefiModules.ts and add test of RAYModule
pash7ka May 4, 2020
3ccac96
Add test for LiquidityModule with RAYModule
pash7ka May 4, 2020
c591285
Update RAY module to create RAY token on first deposit instead of sep…
pash7ka May 6, 2020
4829abe
New Rinkeby deployment
pash7ka May 7, 2020
585738a
Fixes for Certik (wip)
pash7ka May 21, 2020
55b73cb
update artifacts
pash7ka May 21, 2020
d458b93
Fix for "Double use of pToken balances" issue
pash7ka Jun 1, 2020
ec9d45a
Fixes for issues found by Certik in 2020-05-20 report
pash7ka May 21, 2020
0de40b9
Fix solhint error
pash7ka Jun 1, 2020
f7acf8b
Update artifacts
pash7ka Jun 1, 2020
6a0aede
Merge remote-tracking branch 'origin/develop' into feature/defi-ray
pash7ka Jun 1, 2020
119b6a1
Rinkeby deployment of audited version
pash7ka Jun 8, 2020
89d1063
Merge branch 'feature/defi-ray' into test_upgrade_2020-06-05
pash7ka Jun 8, 2020
587ba5b
Changes to allow correct upgrade:
pash7ka Jun 8, 2020
ac72210
Fixes required by solc 0.5.17 (having private functions with same nam…
pash7ka Jun 8, 2020
22c8be0
Short-term fix for RAY CompoundOpportunity problem
pash7ka May 24, 2020
8a7242d
ABI updates
pash7ka Jun 8, 2020
646504e
Deployment upgrade
pash7ka Jun 8, 2020
b6e6b77
Deploy & upgrade scripts
pash7ka Jun 8, 2020
80693e2
Merge pull request #44 from akropolisio/test_upgrade_2020-06-05
0xbuidlman Jun 9, 2020
5ef5713
Short-term fix for RAY CompoundOpportunity problem
pash7ka May 24, 2020
d177a68
Update solc version and optimezer preferences
pash7ka Jun 10, 2020
7bb1f52
add multi-token support
pash7ka Jun 4, 2020
70c19e1
Update artifacts
pash7ka Jun 11, 2020
3359428
credit term added
pash7ka Jun 12, 2020
3e47a2e
update build artifacts
pash7ka Jun 12, 2020
a19b865
add test for credit term (wip)
pash7ka Jun 16, 2020
ade839b
multi-token support fixes and tests (wip)
pash7ka Jun 18, 2020
ca7ec0d
wip
pash7ka Jun 18, 2020
0283d0e
fix test
pash7ka Jun 18, 2020
ec40664
fix LoanModule test
pash7ka Jun 18, 2020
150c301
update artefacts
pash7ka Jun 19, 2020
95708b9
fix other tests
pash7ka Jun 19, 2020
73b1858
fix error messages
pash7ka Jun 19, 2020
e64aa9c
Enable compound and its tests
pash7ka Jun 19, 2020
e1ddb11
Multi-token for CompoundModule
pash7ka Jun 19, 2020
a0a3244
Update build artifacts
pash7ka Jun 19, 2020
c7d89d9
Fix TestnetCErc20Proxy test
pash7ka Jun 19, 2020
acf06ed
Add mutli-token support diagram
pash7ka Jun 22, 2020
dff1f1d
Add CurveFi
pash7ka Jun 29, 2020
53d7dcf
prepare CurveFi tests (wip)
pash7ka Jun 30, 2020
850d761
Add method for withdrawing all tokens at once
pash7ka Jun 30, 2020
b711848
wip
pash7ka Jun 30, 2020
45da122
wip
pash7ka Jul 3, 2020
422b385
wip
pash7ka Jul 6, 2020
e6c8b73
Changes for tests and resolve solhint errors
pash7ka Jul 7, 2020
116a62a
build artifacts
pash7ka Jul 7, 2020
5e17b3d
APY Balancer
pash7ka Jul 10, 2020
2213946
update build artifacts
pash7ka Jul 10, 2020
1855f60
wip
pash7ka Jul 13, 2020
e3c296b
wip
pash7ka Jul 14, 2020
3f332da
Multi-coin withdrawals
pash7ka Jul 14, 2020
1866f34
fix burn limit
pash7ka Jul 14, 2020
ea8b60e
Linter fixes
pash7ka Jul 14, 2020
b6e999f
build artifacts
pash7ka Jul 14, 2020
a98fe87
credit term added
pash7ka Jul 14, 2020
08a56b7
build artifacts
pash7ka Jul 14, 2020
b64ded5
Add option to withdraw in one token
pash7ka Jul 16, 2020
da2d3b6
build artifacts
pash7ka Jul 16, 2020
b2f4794
Fix bug found by Certik
pash7ka Jul 24, 2020
43646b7
Use SafeERC20 in protocols to prevent problems with USDT
pash7ka Jul 24, 2020
2d8b336
Add FundsModule which is alias to DefiFundsModule to simplify upgrade
pash7ka Jul 24, 2020
6f48d6e
Fix wrong function signature
pash7ka Jul 24, 2020
d37eccd
Add RAY DAI protocol to help deployment
pash7ka Jul 24, 2020
be60bba
Deploy script
pash7ka Jul 24, 2020
7f1110d
New Rinkeby deployment
pash7ka Jul 24, 2020
8d67da9
Upgrade ABI
pash7ka Jul 24, 2020
15de499
Fix deposit/withdrawal accumulator (Certik report 2020-07-29 - Exhibi…
pash7ka Jul 29, 2020
32f9fa3
Fix ternary operator (Certik report 2020-07-29 - Exhibit 4)
pash7ka Jul 29, 2020
44f4cb6
Fix variable visibility (Certik report 2020-07-29 - Exhibit 5)
pash7ka Jul 29, 2020
e01f902
Add option for admin to change approval (Certik report 2020-07-29 - E…
pash7ka Jul 29, 2020
0dd9d53
Add check for lProposals <= lBalance (Certik report 2020-07-29 - Exhi…
pash7ka Jul 29, 2020
b583f7d
Linter fixes
pash7ka Jul 29, 2020
343398c
Update build artifacts
pash7ka Jul 29, 2020
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
19 changes: 14 additions & 5 deletions .openzeppelin/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
{
"manifestVersion": "2.2",
"contracts": {
"FreeDAI": "FreeDAI",
"PToken": "PToken",
"Pool": "Pool",
"AccessModule": "AccessModule",
"PToken": "PToken",
"FundsModule": "FundsModule",
"CurveModule": "CurveModule",
"LiquidityModule": "LiquidityModule",
"LoanLimitsModule": "LoanLimitsModule",
"LoanProposalsModule": "LoanProposalsModule",
"LoanModule": "LoanModule",
"FundsModule": "FundsModule",
"AccessModule": "AccessModule"
"APYBalancedDefiModule": "APYBalancedDefiModule",
"CurveFiYProtocol": "CurveFiYProtocol",
"RAYProtocol_DAI": "RAYProtocol_DAI",
"RAYModule": "RAYModule",
"DefiFundsModule": "DefiFundsModule"
},
"dependencies": {},
"name": "akropolis-pool",
"version": "1.0.0",
"compiler": {
"manager": "truffle",
"compilerSettings": {
"optimizer": {
"enabled": false,
"runs": "200"
}
},
"typechain": {
"enabled": false
},
"manager": "truffle",
"artifactsDir": "build\\contracts",
"contractsDir": "contracts"
},
Expand Down
Loading