Amir Bandeali
57ca601be1
Remove wethAssetProxy and wethAssetData from staking contract
2019-09-29 15:45:08 -07:00
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
Francesco Agosti
d21f978def
Merge pull request #2212 from 0xProject/refactor/no-domain-in-order
...
Remove domain from Order and remove OrderWithoutDomain type
2019-09-27 14:04:18 -07:00
fragosti
88dcf6350d
Fix exchange-libs test
2019-09-27 13:20:09 -07:00
Michael Zhu
6cfc17de35
MixinStakeStorage unit tests
2019-09-27 13:01:20 -07:00
fragosti
efd5eff22c
Fix tests
2019-09-27 12:46:20 -07:00
Alex Towle
9282684d93
@0x:contracts-staking Added a full end-to-end test of a deployment of the exchange and staking system
2019-09-26 18:10:52 -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
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
fragosti
f0e0f08e0c
Run linter and prettier
2019-09-25 18:44:19 -07:00
fragosti
8ba38b9b29
Remove the OrderWithoutDomain type
2019-09-25 18:44:19 -07:00
fragosti
9870f55d24
Remove domain from Order type
2019-09-25 18:44:19 -07:00
Alex Towle
3fa922dbab
@0x:contracts-staking Wrote a basic deployment test
2019-09-25 18:09:50 -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
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 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
Amir Bandeali
25cb1c1138
Remove epoch param that is always equivalent to currentEpoch
2019-09-25 10:58:16 -07:00
Amir Bandeali
22a6de48ae
Remove arguments that are unnecessarily passed around
2019-09-25 10:43:14 -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
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
f30c2c4a23
Make setZrxProxy callable by authorized address rather than only owner
2019-09-24 17:27:53 -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
Amir Bandeali
1b159f5ccc
Make deployment constant getters public
2019-09-24 16:43:08 -07:00
Amir Bandeali
85e56706bf
Remove wethAssetProxy and zrxVault from storage layout assertions
2019-09-24 16:19:53 -07:00
Amir Bandeali
b8b21cefe3
Make deployment constants private and use string reverts for constructor assertions
2019-09-24 16:19:53 -07:00
Amir Bandeali
6d7bf12ade
Make wethAssetProxy and zrxVault deployment constants
2019-09-24 16:19:53 -07:00
Amir Bandeali
0c5f0271c7
Merge pull request #2190 from 0xProject/feat/3.0/consolidate-pool-mixins
...
Consolidate staking pool mixins
2019-09-24 14:00:28 -07:00
Amir Bandeali
7f51822bfc
Fix storage layout assertions
2019-09-24 13:38:48 -07:00
Amir Bandeali
1acd8d9577
Make _poolJoinedByMakerAddress internal
2019-09-24 13:36:54 -07:00
Amir Bandeali
8aa302f6fc
Update OnlyCallableByPoolOperatorOrMakerError params and address PR feedback
2019-09-24 13:36:54 -07:00
