Amir Bandeali
b5545255d0
Merge pull request #2245 from 0xProject/fix/3.0/validate-assetdata
...
Enforce assetData is padded to 32 bytes
2019-10-10 10:55:22 +09:00
Amir Bandeali
8e2b971f5a
Merge pull request #2249 from 0xProject/feat/staking/catastrophic-failure-backstop
...
Read-only mode backstop
2019-10-09 19:16:10 +09:00
Amir Bandeali
3fd7132a0d
Merge pull request #2248 from 0xProject/fix/staking/cleanup-accounting
...
Simplify staking state
2019-10-09 18:00:06 +09:00
Amir Bandeali
93edb083fa
Remove payable fallback from IStakingProxy, fix linting errors
2019-10-09 17:27:37 +09:00
Amir Bandeali
9e41c648dc
Add backstop tests
2019-10-09 17:27:37 +09:00
Amir Bandeali
a7ef54dbff
Implement ZrxVaultBackstop
2019-10-09 17:27:37 +09:00
Amir Bandeali
414084a7ad
Track state of read-only mode in stakingProxy
2019-10-09 17:27:37 +09:00
Amir Bandeali
681e6eab7a
Cleanup language used in comments and variable names
2019-10-09 17:15:25 +09:00
Amir Bandeali
701b203c58
Fix tests
2019-10-09 17:15:25 +09:00
Amir Bandeali
cbd0ca4b60
Make currentEpoch uint64 type, change INACTIVE => UNDELEGATED, and make global balances state a mapping from uin8 => StoredBalance
2019-10-09 17:15:25 +09:00
Amir Bandeali
1626566f93
Change getBalanceOfVault => getBalanceOfZrxVault
2019-10-09 17:15:25 +09:00
Amir Bandeali
ac75053f69
Remove unused rich revert
2019-10-09 17:15:25 +09:00
Amir Bandeali
13afc65b54
Do not store global inactive state
2019-10-09 17:15:25 +09:00
Amir Bandeali
aa0a1bb54d
Fix tests to no longer utilize active stake
2019-10-09 17:15:25 +09:00
Amir Bandeali
2e36c7ef83
Remove ACTIVE state
2019-10-09 17:15:25 +09:00
Amir Bandeali
43399a9ad9
Refactor tests to use new getters
2019-10-09 17:15:25 +09:00
Amir Bandeali
2ef546210d
Update tests to reflect new withdrawal logic
2019-10-09 17:15:25 +09:00
Amir Bandeali
7b379f3933
Simplify withdrawal flow and storage layout
2019-10-09 17:15:25 +09:00
Amir Bandeali
f8ac986a0f
Remove unused struct field
2019-10-09 17:14:28 +09:00
Greg Hysz
7ac7f45c4a
Merge pull request #2250 from 0xProject/cleanup/staking/simplifyMakers
...
Simplify Makers Interactions with Staking Pools
2019-10-08 11:25:07 +09:00
Greg Hysen
b3c7ccec57
Changed nextPoolId to lastPoolId
2019-10-08 10:43:18 +09:00
Lawrence Forman
93725ecec0
Merge pull request #2233 from 0xProject/feat/erc20-bridge/uniswap
...
UniswapBridge
2019-10-08 10:31:47 +09:00
Amir Bandeali
3c31ef188a
Merge pull request #2246 from 0xProject/fix/3.0/always-validate-signatures
...
Always validate order signatures
2019-10-08 10:25:28 +09:00
Lawrence Forman
53df2130ea
@0x/contracts-asset-proxy: Remove only modifier on uniswap tests.
2019-10-08 09:27:53 +09:00
Amir Bandeali
8b695f9b98
Fix race condition in tests
2019-10-08 09:12:37 +09:00
Amir Bandeali
d914f6fce9
Test for failure with bad signature after partial fill
2019-10-08 09:12:37 +09:00
Amir Bandeali
e2e5152648
Always validate signatures for all types
2019-10-08 09:12:37 +09:00
Lawrence Forman
d3dcf7fb0c
Merge pull request #2247 from 0xProject/fix/3.0-audit/staking/shadowed-variable
...
fix `_computeUnfinalizedDelegatorReward()` shadowed variable and function mutability
2019-10-07 18:50:32 -05:00
Greg Hysen
a0f5a8b64b
Simplify Makers Interactions with Staking Pools.
...
- No longer an upper limit on how many makers can be in a pool.
- No longer a handshake for a maker to join a pool.
- No longer any special powers given to makers.
- Pool Id starts at 1 and increments by 1.
2019-10-08 06:00:24 +09:00
mzhu25
ee508f70bc
Merge pull request #2228 from 0xProject/fix/3.0/refundFinalBalanceNoReentry
...
refundFinalBalanceNoReentry
2019-10-06 13:39:04 -07:00
mzhu25
200b3d450f
Merge pull request #2229 from 0xProject/feature/3.0/update-coordinator
...
Update Coordinator for 3.0
2019-10-06 13:20:00 -07:00
Michael Zhu
52fc7517f9
Remove approval expirations, address other comments
2019-10-06 12:45:48 -07:00
Michael Zhu
cf517b1459
appease static tests
2019-10-06 12:44:58 -07:00
Michael Zhu
c17984b74f
Refactor integration tests (CoordinatorTestFactory)
2019-10-06 12:44:58 -07:00
Michael Zhu
589d2212ee
Test coordinator protocol fees
2019-10-06 12:44:58 -07:00
Michael Zhu
9b922f746b
Update coordinator tests
2019-10-06 12:44:58 -07:00
Michael Zhu
0e7387550c
Update contracts
2019-10-06 12:44:58 -07:00
Lawrence Forman
dbf22583b5
@0x/contracts-asset-proxy: Remove unecessary token allowance when coming from WETH.
2019-10-05 22:37:51 -05:00
Lawrence Forman
6825eb442b
@0x/contracts-staking: Fix shadowed variable in MixinStakingPoolRewards._computeUnfinalizedDelegatorReward() and make the function pure.
2019-10-05 17:22:46 -05:00
James Towle
45f284973a
Merge pull request #2240 from 0xProject/feature/integration-tests/deployment-manager
...
Deployment Manager
2019-10-05 15:14:12 -07:00
Lawrence Forman
ef6e691646
@0x/contracts-exchange-libs: Update generated source files after revase.
2019-10-05 16:29:06 -05:00
Lawrence Forman
e67888d65f
@0x/contracs-asset-proxy: Pass in minimum buy amounts in the UniswapBridge.
...
`@0x/contracs-asset-proxy`: Slight refactors in `UniswapBridge`.
2019-10-05 16:27:24 -05:00
Lawrence Forman
584f8b13fe
@0x/contracts-asset-proxy: Rebase and update Eth2DaiBridge to use IWallet from exchange-libs.
2019-10-05 13:57:51 -05:00
Lawrence Forman
f993b6d1ed
@0x/contracts-exchange: Revert changes to IWallet.
2019-10-05 13:57:51 -05:00
Lawrence Forman
035dc607db
@0x/contracts-asset-proxy: Use IWallet from exchange-libs.
...
`@0x/contracts-asset-proxy`: Fix some comment typos in `UniswapBridge`.
`@0x/contracts-asset-proxy`: Add more allowance tests to the `UniswapBridge` tests.
2019-10-05 13:57:51 -05:00
Lawrence Forman
cf2053ec77
@0x/contracts-exchange-libs: Move IWallet from asset-proxy and exchange packages into this package.
2019-10-05 13:57:51 -05:00
Lawrence Forman
3840ebf538
@0x/contracts-exchange: Move IWallet.sol to exchange-libs.
2019-10-05 13:57:51 -05:00
Lawrence Forman
80cb6b654b
@0x/contracts-asset-proxy: Fix linter errors.
2019-10-05 13:57:51 -05:00
Lawrence Forman
ab70c4df74
@0x/contracts-asset-proxy: Remove only modifier on tests.
2019-10-05 13:57:51 -05:00
Lawrence Forman
95e461072f
@0x/contracts-asset-proxy: Always set allowance.
2019-10-05 13:57:50 -05:00
