Revert #312 #327
Merged
Revert #312 #327
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
haythemsellami
pushed a commit
that referenced
this pull request
Dec 28, 2020
aparnakr
added a commit
that referenced
this pull request
Jan 17, 2021
* Oracle updates from #310 (#324) * push oracle updates from #310 * update tests * manually revert #279 (#325) * apply needed changes from 279 (#326) * revert 312 (#327) * apply more changes from 310 * 0x callee e2e with actual mm bot order works * modifying call to batchFillOrders * fix encoding * added indirectCall to callee * 0x basic sell works * 0x removing call to payable proxy * open naked and spread positions work * remove 0xCalle direct and indirct tests * add back cToken + remove old tests not working * update mainnet fork to work with CI; add package.json script * update scripts * remove indirect call * route trade via payable proxy * use permit instead of transferFrom * add back trader * add require Co-authored-by: Haythem Sellami <haythem96@users.noreply.github.com> Co-authored-by: Haythem Sellami <sellamihaythem96@gmail.com>
aparnakr
added a commit
that referenced
this pull request
Jan 17, 2021
* Checks when adding pricer or stable price (#311) * add check when adding pricer or stable price * add tests * Fix Compound pricer (#310) * fix Compound pricer * fix integration tests * update Oracle module to return always true for locking and dispute period for stable asset * clean Co-authored-by: aparnakr <aparnalocked@gmail.com> * clean Co-authored-by: aparnakr <aparnalocked@gmail.com> * fix controller unit tests * remover pricer from mock and fix unit tests * improve code coverage Co-authored-by: aparnakr <aparnalocked@gmail.com> * Compound tokens wrapper (#312) * initial interfaces + operators WIP * eth changes * rename and WIP testing * cToken mock with mint and redeem + other fixes * fix controller unit tests * test changes * test updates Co-authored-by: aleone <aleone.mit@gmail.com> Co-authored-by: aparnakr <aparnalocked@gmail.com> Co-authored-by: Anton Cheng <antonassocareer@gmail.com> * Feature: 0x callee and updates for PayableProxy (#279) * Update syntax to comment up unused parameters * Add 0x Interface and callee * Add decodeERC20Asset * Remove test variables * Update coverage script * Pay fee with eth * Add spender in PayableProxyController.sol * Finish e2e test * Add approve if action = call * Update e2e test * use safeIncreaseAllowance * Improve coverage * Remove decodeERC20Asset in MockOxExchange * Add comment, use safeIncreaseAllowance * [Certora 13]: Ensure that the margin pool cannot transfer assets to/from itself (#314) * fix M04 * ensure assets cannot be transferred from Margin pool to / from margin pool * remove the check for transferToPool * Update README.md * Fix typo collateralDecimals (#319) * Update README.md * update deployment script * update truffle config * Fix CircleCI E2E testing (#321) * fix CI e2e testing * make shell script executable * Truffle deployment script (#320) * update deployment script * update truffle config * truffle script to deploy Chainlink pricer contracts * Fix typo Co-authored-by: Anton Cheng <antonassocareer@gmail.com> * payable proxy contract deployment script * update readme * Fix typo Co-authored-by: Anton Cheng <antonassocareer@gmail.com> * Fix typo Co-authored-by: Anton Cheng <antonassocareer@gmail.com> Co-authored-by: Anton Cheng <antonassocareer@gmail.com> * Refactor _isNotEmpty() usage (#318) * refactor _isNotEmpty usage * fix typo * Revert "Fix Compound pricer (#310)" (#323) This reverts commit c2b51d0. * Oracle updates from #310 (#324) * push oracle updates from #310 * update tests * manually revert #279 (#325) * apply needed changes from 279 (#326) * revert 312 (#327) * apply more changes from 310 * Clean code (#328) * Oracle updates from #310 (#324) * push oracle updates from #310 * update tests * manually revert #279 (#325) * apply needed changes from 279 (#326) * revert 312 (#327) * apply more changes from 310 * add missing file * fix CI (#329) * Fixed trailingZeroes initialization (#332) Replaced `uint256 trailingZeroes = 0;` for `uint256 trailingZeroes;` for minor gas saving. * Certora - full integration (#331) * initial work on integrating * more cleanup * harness marginpool * applying harnesses * updates to ci * no need for expected in whitelist * updates * cleanup harnesses * updates to get settleVault * fix run * oops solc no version * update * more rules * enable usage of ci mode * separate orderOfOperations because it's big * updates * fix * update * update * lint * revert interface changes * interface * cleanup * all aligned - certora tests should pass now * update spec for new version * oops * update * fix * fix links for validBalanceOfTheSystem * forgot collateral * fix links Co-authored-by: Haythem Sellami <haythem96@users.noreply.github.com> * 0x callee e2e with actual mm bot order works * modifying call to batchFillOrders * fix encoding * added indirectCall to callee * 0x basic sell works * 0x removing call to payable proxy * open naked and spread positions work * remove 0xCalle direct and indirct tests * add back cToken + remove old tests not working * Refactor Otoken minting (#344) * refactor Otoken * more refactoring * more refactoring * fix build * update mainnet fork to work with CI; add package.json script * update scripts * Implement permit functionality (#340) * add ERC20 permit contracts * add ERC20PermitUpgradeable * remove erc20upgradeable * add back ERC20Upgradeable * fix build * remove indirect call * route trade via payable proxy * use permit instead of transferFrom * add back trader * add require Co-authored-by: Haythem Sellami <haythem96@users.noreply.github.com> Co-authored-by: aleone <aleone.mit@gmail.com> Co-authored-by: Anton Cheng <antonassocareer@gmail.com> Co-authored-by: Haythem Sellami <sellamihaythem96@gmail.com> Co-authored-by: AlphaSerpentis <37189157+AlphaSerpentis@users.noreply.github.com> Co-authored-by: shellygr <shellygr@users.noreply.github.com>
haythemsellami
pushed a commit
that referenced
this pull request
Jan 29, 2021
* Oracle updates from #310 (#324) * push oracle updates from #310 * update tests * manually revert #279 (#325) * apply needed changes from 279 (#326) * revert 312 (#327) * apply more changes from 310 * add ERC20 permit contracts * add ERC20PermitUpgradeable * remove erc20upgradeable * add back ERC20Upgradeable * 0x callee e2e with actual mm bot order works * modifying call to batchFillOrders * fix encoding * added indirectCall to callee * Permit() callee * fix typo * tests * clean * 0x basic sell works * 0x removing call to payable proxy * open naked and spread positions work * remove 0xCalle direct and indirct tests * add back cToken + remove old tests not working * update mainnet fork to work with CI; add package.json script * update scripts * remove indirect call * console * OZ tests * tests * Feature/0xtrade with permit (#354) * Update syntax to comment up unused parameters * Add 0x Interface and callee * Add approve * transfer extra fee * Add decodeERC20Asset * Remove test variables * Add e2e test * Ignore coverage * Add test * Update coverage script * Pay fee with eth * Add spender in PayableProxyController.sol * Finish e2e test * Add approve if action = call * Update e2e test * use safeIncreaseAllowance * Add unit test * Add Event * Improve coverage * Remove decodeERC20Asset in MockOxExchange * Add comment, use safeIncreaseAllowance * try context * Update command * Refactor * Use plain key * route trade via payable proxy * use permit instead of transferFrom * add back trader * add require Co-authored-by: Anton Cheng <antonassocareer@gmail.com> Co-authored-by: Haythem Sellami <sellamihaythem96@gmail.com> * unit tests * fix tests * clean * clean packages * test the failing conditions * failing test * comment unnecessary * delete uneeded * change to Otoken instance * tests * tests * fixed signatures * fix sending txs * tests * tests * tests * clean contracts * update .gitignore * move folders * working mainnet-fork tests; removed un-needed unit tests * clean * Adding 0x callee unit tests (#359) * adding unit tests * clean * fix build * update mocks * clean * clean Co-authored-by: Haythem Sellami <sellamihaythem96@gmail.com> * clean * ignore Trade0x in coverage Co-authored-by: aparnakr <aparnalocked@gmail.com> Co-authored-by: Anton Cheng <antonassocareer@gmail.com>
haythemsellami
pushed a commit
that referenced
this pull request
Feb 4, 2021
* Oracle updates from #310 (#324) * push oracle updates from #310 * update tests * manually revert #279 (#325) * apply needed changes from 279 (#326) * revert 312 (#327) * apply more changes from 310 * add ERC20 permit contracts * add ERC20PermitUpgradeable * remove erc20upgradeable * add back ERC20Upgradeable * 0x callee e2e with actual mm bot order works * modifying call to batchFillOrders * fix encoding * added indirectCall to callee * Permit() callee * fix typo * tests * clean * 0x basic sell works * 0x removing call to payable proxy * open naked and spread positions work * remove 0xCalle direct and indirct tests * add back cToken + remove old tests not working * update mainnet fork to work with CI; add package.json script * update scripts * remove indirect call * console * OZ tests * tests * Feature/0xtrade with permit (#354) * Update syntax to comment up unused parameters * Add 0x Interface and callee * Add approve * transfer extra fee * Add decodeERC20Asset * Remove test variables * Add e2e test * Ignore coverage * Add test * Update coverage script * Pay fee with eth * Add spender in PayableProxyController.sol * Finish e2e test * Add approve if action = call * Update e2e test * use safeIncreaseAllowance * Add unit test * Add Event * Improve coverage * Remove decodeERC20Asset in MockOxExchange * Add comment, use safeIncreaseAllowance * try context * Update command * Refactor * Use plain key * route trade via payable proxy * use permit instead of transferFrom * add back trader * add require Co-authored-by: Anton Cheng <antonassocareer@gmail.com> Co-authored-by: Haythem Sellami <sellamihaythem96@gmail.com> * unit tests * fix tests * clean * clean packages * test the failing conditions * failing test * comment unnecessary * delete uneeded * change to Otoken instance * tests * tests * fixed signatures * fix sending txs * tests * tests * tests * clean contracts * update .gitignore * move folders * working mainnet-fork tests; removed un-needed unit tests * clean * Adding 0x callee unit tests (#359) * adding unit tests * clean * fix build * update mocks * clean * clean Co-authored-by: Haythem Sellami <sellamihaythem96@gmail.com> * Callee scripts deployment * more scripts * kovan 0x trading * test * rename file * add constants Co-authored-by: aparnakr <aparnalocked@gmail.com> Co-authored-by: Anton Cheng <antonassocareer@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Revert #312