crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,394 Commits 83 Branches 5,211 Tags
b50e26dc2a40d290046fa689de83bf1528cd72a4
Commit Graph

14394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lawrence Forman
b50e26dc2a @0x/contracts-asset-proxy: Rename IERC20Bridge.transfer() -> IERC20Bridge.withdrawTo(). 
`@0x/contracts-asset-proxy`: Make `bridgeData` last parameter in `IERC20Bridge.withdrawTo()`.
`@0x/contracts-asset-proxy`: Reuse `PROXY_ID` as `BRIDGE_SUCCESS`.
 2019-09-29 17:10:38 -04:00
Lawrence Forman
b728d13d8c @0x/contracts-asset-proxy: Remove only tests modifier. 2019-09-27 23:54:32 -04:00
Lawrence Forman
1959d149f8 @0x/contracts-asset-proxy: Fix incorrect comments in ERC20BridgeProxy tests. 2019-09-27 19:49:23 -04:00
Lawrence Forman
3e2e05caf2 Update changelogs 2019-09-27 19:47:14 -04:00
Lawrence Forman
d6a4d67a14 @0x/contracts-asset-proxy: Add ERC20BridgeProxy and tests. 2019-09-27 19:33:33 -04:00
Lawrence Forman
cf8d424b9b @0x/contracts-test-utils: Add number_utils.ts and hexSize(). 2019-09-27 19:32:55 -04:00
Lawrence Forman
a9f1237208 ethereum-types: Add DecodedLogs type (again?). 2019-09-27 19:32:05 -04:00
mzhu25
f5ad65bb8a Merge pull request #2217 from 0xProject/feature/contracts-staking/mixin-stake-storage-unit-tests 
MixinStakeStorage unit tests
 2019-09-27 13:20:42 -07:00
Michael Zhu
6cfc17de35 MixinStakeStorage unit tests 2019-09-27 13:01:20 -07:00
James Towle
c9e03f7d42 Merge pull request #2211 from 0xProject/feature/staking/exchange-manager-units 
`@0x:contracts-staking` Added unit tests for MixinExchangeManager
 2019-09-26 15:53:40 -07:00
Xianny
690b31c9be update artifacts and wrappers with pre-audit contracts (#2213) 
* update artifacts and wrappers with pre-audit contracts

* increase bundlesize
 2019-09-26 09:35:24 -07:00
Xianny
cb20f03a92 Use hardcoded deployedBytecode for local EVM execution (#2198) 
* hardcode deployedBytecode in contracts

* log warning if bytecode is empty or invalid

* be typesafe
 2019-09-26 08:38:29 -07:00
David Sun
97eabc6c03 Merge pull request #2157 from 0xProject/feature/orderbook-removing-smart-routing-logic 
Refactored asset-swapper smart logic and renamed options
 2019-09-26 09:18:05 -04:00
Xianny
23b724dde4 Merge pull request #2209 from 0xProject/fix/all-tests 
Enable tests on 3.0
 2019-09-25 18:32:43 -07:00
Alex Towle
aa7f082d56 @0x:contracts-staking Addressed review comments 2019-09-25 16:48:34 -07:00
Alex Towle
b178d025b5 @0x:contracts-staking Added unit tests for MixinExchangeManager 2019-09-25 15:32:02 -07:00
David Sun
e333ab18c7 removed smart quote consumer in favor of utils 2019-09-25 18:30:21 -04:00
David Sun
b60db6ac72 removed smart logic and renamed options 2019-09-25 18:30:21 -04:00
Lawrence Forman
96c8da9fdd Merge pull request #2207 from 0xProject/fix/3.0/improve-readability 
Improve readability, fix `_trySetCumulativeReward` logic
 2019-09-25 17:14:06 -04:00
Greg Hysz
fca883a4aa Merge pull request #2208 from 0xProject/cleanup/staking/spec 
Updated README to point to new specification
 2019-09-25 14:01:51 -07:00
David Sun
e60d43110d Merge pull request #2159 from 0xProject/feature/asset-swapper-smarter-fee-logic 
Feature asset-swapper smarter fee logic
 2019-09-25 16:45:41 -04:00
Greg Hysen
b9b135cfa2 Finished removing outdated contract comments 2019-09-25 13:41:27 -07:00
Lawrence Forman
f925c35344 @0x/contracts-staking: Always do _withdrawAndSyncDelegatorRewards() before staking operations and always add a CR (if unset) in _withdrawSyncDelegatorRewards()`. 2019-09-25 16:34:06 -04:00
Greg Hysen
ca2e9bed27 Updated README to point to new specification, plus removed images we no longer need. 2019-09-25 12:48:12 -07:00
Lawrence Forman
5b77e2c8ac @0x/contracts-staking: Fix stake accounting. 2019-09-25 15:29:22 -04:00
Amir Bandeali
9e3331d018 Fix ordering of function calls, remove optimization in _forceSetCumulativeReward 2019-09-25 11:31:30 -07:00
Amir Bandeali
4440075425 Inline _forceSetMostRecentCumulativeRewardEpoch 2019-09-25 11:03:26 -07:00
xianny
626948774b add comment 2019-09-25 11:01:30 -07:00
Amir Bandeali
25cb1c1138 Remove epoch param that is always equivalent to currentEpoch 2019-09-25 10:58:16 -07:00
xianny
4a173deb27 Merge branch '3.0' into fix/all-tests 2019-09-25 10:51:22 -07:00
xianny
245c87f026 re-enable test-rest 2019-09-25 10:48:55 -07:00
Amir Bandeali
22a6de48ae Remove arguments that are unnecessarily passed around 2019-09-25 10:43:14 -07:00
Xianny
a347c1e848 Remove unnecessary function binding (#2202) 
* remove unnecessary function binding

* reenable tests
 2019-09-25 09:49:47 -07:00
mzhu25
e4ab832ced Merge pull request #2205 from 0xProject/feature/contracts-staking/rip-mixin-vault-core 
Consolidate MixinVaultCore and ZrxVault + unit tests
 2019-09-24 23:23:32 -07:00
Amir Bandeali
d07005dcbe Change increment -> increase and decrement -> decrease 2019-09-24 23:04:37 -07:00
Michael Zhu
dc06497cae consolidate MixinVaultCore and ZrxVault 2019-09-24 23:04:17 -07:00
Amir Bandeali
c1871b5bca Fix xumulative reward tests 2019-09-24 23:01:44 -07:00
Amir Bandeali
410b9c50d3 Flatten _withdrawAndSyncDelegatorRewards function, fix bug where cumulative rewards are always reset 2019-09-24 23:01:31 -07:00
James Towle
1c42d0ab3c Merge pull request #2206 from 0xProject/fix/3.0/cleanup-inheritance-again 
Cleanup inheritance... again
 2019-09-24 19:13:54 -07:00
Amir Bandeali
98698f702f Remove redundant inheritance and imports 2019-09-24 18:47:27 -07:00
Amir Bandeali
4784131dca Merge pull request #2203 from 0xProject/feat/3.0/consolidate-rich-reverts 
Cleanup rich reverts
 2019-09-24 18:32:41 -07:00
James Towle
6eb28b792a Merge pull request #2204 from 0xProject/feature/staking/move-storage-layout-assertions 
Feature/staking/move storage layout assertions
 2019-09-24 18:32:12 -07:00
Amir Bandeali
57f5b12e24 Cleanup rich reverts 2019-09-24 18:13:37 -07:00
Amir Bandeali
e5aaf68277 Use uin8 instead of uint256 for status 2019-09-24 18:13:37 -07:00
Alex Towle
b62486923f @0x:contracts-staking Removed storage assertions from Staking and moved them to a test contract 2019-09-24 18:12:00 -07:00
Amir Bandeali
322a0a5967 Merge pull request #2201 from 0xProject/fix/3.0/rename-owner 
Rename shadowed instances of `owner` to `staker`
 2019-09-24 17:46:38 -07:00
Amir Bandeali
f30c2c4a23 Make setZrxProxy callable by authorized address rather than only owner 2019-09-24 17:27:53 -07:00
xianny
44e5fa5b25 improve readability of async error tests 2019-09-24 16:53:59 -07:00
Amir Bandeali
18a86ef234 Replace all shadowed instances of 'owner' with 'staker' 2019-09-24 16:52:09 -07:00
Alex Towle
a6af3744e2 @0x:contracts-staking Improved the test coverage of MixinStakingPool 2019-09-24 16:49:34 -07:00