Commit Graph

76 Commits

Author SHA1 Message Date
andyk
b4a0841577 Merge branch 'master' into 178-add-uniswap-adapters 2020-11-30 15:11:35 +04:00
eboado
9d1c021945 - Modified FlashLoanReceiverBase 2020-11-30 12:02:34 +01:00
Gerardo Nardelli
cdd922c908 Merge fixes 2020-11-25 11:07:33 -03:00
Gerardo Nardelli
71ea58f758 Merge branch 'master' into feat/uniswap-adapter-flashloan
# Conflicts:
#	test/__setup.spec.ts
2020-11-25 10:46:01 -03:00
Gerardo Nardelli
a496be8833 Refactor to avoid leftovers on _swapAndRepay with flash loan 2020-11-25 10:44:50 -03:00
eboado
e2d1a274bc Merge branch 'master' into feat/153-improve-docs 2020-11-23 15:56:55 +01:00
David Racero
6532fd0765 Move protocol contracts inside own directory to scope audits. Update library hash at contracts-deployments.ts:165 due libraries paths has changed. 2020-11-23 11:28:57 +01:00
eboado
0bca8c6519 Merge branch 'master' into feat/153-improve-docs 2020-11-23 11:15:31 +01:00
The3D
f1778b88d4 Removed the ^ on solidity version 2020-11-20 11:45:20 +01:00
The3D
8c03180f89 Updated solidity version 2020-11-20 11:41:58 +01:00
Gerardo Nardelli
3f779e2e9f Merge branch 'master' into feat/uniswap-adapter-flashloan
# Conflicts:
#	helpers/contracts-deployments.ts
#	helpers/types.ts
#	test/__setup.spec.ts
#	test/helpers/make-suite.ts
2020-11-06 14:26:31 -03:00
Gerardo Nardelli
847ad3b12a Add batch swaps unit tests 2020-11-03 15:37:06 -03:00
David Racero
a54f910928 Added emergency token and ether withdrawal. Follow code guidelines. 2020-11-03 17:23:35 +01:00
David Racero
a4a02e761b Merge branch 'master' of gitlab.com:aave-tech/protocol-v2 into 97-create-a-utility-contract-to-deposit-withdraw-repay-with-eth 2020-11-02 16:54:22 +01:00
David Racero
6d009f796d Moved WETH9.sol to mock/dependencies due is only for testing purposes 2020-11-02 15:47:02 +01:00
David Racero
a12706949d WETH9Mocked now inherits from WETH9 instead of copying the contract 2020-11-02 15:33:37 +01:00
The3D
1b021dca18 Added tests 2020-11-02 14:44:11 +01:00
David Racero
e9d21ef74d Fixed conflicts 2020-11-02 10:20:59 +01:00
Gerardo Nardelli
8278d2e6d8 Merge branch 'master' into feat/uniswap-adapter-flashloan 2020-10-30 12:09:29 -03:00
eboado
631d6ebfcb - Passed initiator param to flashLoan()'s executeOperation() receiver.
- Removed unused ISwapAdapter.
2020-10-30 13:32:42 +01:00
Gerardo Nardelli
17095c3ae1 Merge branch 'master' into feat/uniswap-adapter-flashloan
# Conflicts:
#	helpers/contracts-helpers.ts
#	helpers/types.ts
#	test/__setup.spec.ts
#	test/helpers/make-suite.ts
2020-10-29 16:49:25 -03:00
David Racero
744befc46c Added deposit test for WETHGateway 2020-10-29 12:44:21 +01:00
Gerardo Nardelli
e5d37e1a8c Add view method to estimate swaps outputs 2020-10-27 16:32:09 -03:00
The-3D
7eb31124b2 Merge branch 'fix/83-msgSender' into 'master'
- Changed msg.sender to _msgSender()

See merge request aave-tech/protocol-v2!97
2020-10-27 14:05:03 +00:00
eboado
87bbfb9571 - Changed msg.sender to _msgSender() 2020-10-27 14:42:11 +01:00
Gerardo Nardelli
723e3f82a6 Merge branch 'master' into feat/uniswap-adapter-flashloan
# Conflicts:
#	helpers/contracts-helpers.ts
#	test/__setup.spec.ts
#	test/helpers/make-suite.ts
2020-10-27 09:26:43 -03:00
Gerardo Nardelli
a05b75b467 Add uniswap adapters unit tests 2020-10-27 09:18:30 -03:00
pol
52c21a38ba Merge branch 'master' of sendra.gitlab.com:aave-tech/protocol-v2 into feat/70-basic-flow-task 2020-10-27 10:49:34 +01:00
pol
1384afa534 merged conflicts 2020-10-23 13:04:09 +02:00
The3D
a2e2450bb3 Finalized implementation, fixed tests 2020-10-22 20:37:50 +02:00
The3D
b7efa920ca Remove swapLiquidity/repayWithCollateral 2020-10-22 11:50:04 +02:00
pol
258b70fad3 cleaned code 2020-10-20 15:19:41 +02:00
pol
4e951147c2 added type method on aggregator 2020-10-20 12:54:17 +02:00
The3D
6a06a3e88f removed openzeppelin imports2 2020-10-15 15:41:56 +02:00
The3D
937fb1df93 Folders reorg 2020-10-15 15:25:27 +02:00
The3D
86ddf25a3a Reorganized folders 2020-10-15 15:16:05 +02:00
David Racero
b919886916 Remove unused imports 2020-10-14 09:53:48 +02:00
The3D
53d6114775 Merge branch 'master' into feat/18 2020-10-12 15:19:27 +02:00
eboado
80bdb0f2b2 Changed return of executeOperation() to bool, as the amount is never used. 2020-10-12 12:00:49 +02:00
The3D
d150458604 Merge branch 'master' into feat/18 2020-10-08 15:41:48 +02:00
eboado
273070fada Added return uint256 validation to flashLoan() 2020-10-07 16:20:32 +02:00
The3D
274b63713d Merge branch 'master' into fix/34 2020-09-16 16:34:29 +02:00
andyk
125644cc54 Merge branch 'master' into feat/pei-integration 2020-09-15 18:43:55 +03:00
andyk
43c8ef02db initial integration of pei, no tests 2020-09-15 16:53:20 +03:00
The3D
c6a3588792 Merge branch 'master' into fix/34 2020-09-15 15:33:09 +02:00
David Racero
6842978706 Merge and fix conflicts 2020-09-15 10:57:04 +02:00
The3D
dbf1a0b9e7 Merge branch 'master' into fix/34 2020-09-14 09:22:39 +02:00
eboado
7a8a0d6ac5 Merge branch 'master' into 30-collateral-swap 2020-09-14 08:58:37 +02:00
The3D
4a1e1156f4 Merge local branch 2020-09-10 12:51:52 +02:00
eboado
4b3abac526 Merge branch 'master' into feat/26-repay-collateral 2020-09-09 21:12:36 +02:00