Michael Zhu
b45ec47eee
address comments
2019-10-17 19:53:43 -07:00
Michael Zhu
ffac52f42e
lint
2019-10-16 20:19:04 -07:00
Michael Zhu
cde0169733
Update BlockchainBalanceStore to not rely on erc*_wrappers + better balance equality assertions
2019-10-16 18:46:55 -07:00
Lawrence Forman
a6603d6bd6
@0x/contracts-staking: Fix typo in MixinCumulativeRewards
2019-10-14 15:19:34 +10:00
Lawrence Forman
54a03eacd6
@0x/contracts-staking: Refactor MixinCumulativeRewards and MixinStakingPoolRewards to better encapsulate cumulative rewards.
...
`@0x/contracts-staking`: Make sure we don't overwrite an existing CR.
`@0x/contracts-staking`: Remove the need to initialize cumulative rewards when creating a pool.
`@0x/contracts-staking`: Just return an empty CR in `_getCumulativeRewardAtEpoch()` if one can't be found.
2019-10-14 12:36:26 +10:00
Amir Bandeali
9d9fe882b6
Remove unnecessary payable keywords
2019-10-14 09:58:31 +09:00
Amir Bandeali
4f6958b7b5
Do not import @0x/contracts-extensions to fix build
2019-10-14 09:46:06 +09:00
Amir Bandeali
9a5752fff9
Remove unused param in Pool struct
2019-10-14 09:45:37 +09:00
Amir Bandeali
c21932d149
Remove _creditRewardsToPool and remove return values from finalizePool
2019-10-13 17:31:55 +09:00
Amir Bandeali
ce6c05637f
Update cumulative rewards tracking tests
2019-10-13 17:31:55 +09:00
Amir Bandeali
b0699fc238
Always set cumulative rewards when _withdrawAndSyncDelegatorRewards is called
2019-10-13 17:31:55 +09:00
Amir Bandeali
8bf7c4cf48
Remove unnecessary assert
2019-10-13 17:31:55 +09:00
Lawrence Forman
9f6d113fe8
Merge pull request #2255 from 0xProject/fix/3.0-audit/staking/LibFixedMath-arithmetic-overflows
...
Fix LibFixedMath arithmetic overflows
2019-10-12 07:38:05 +09:00
James Towle
646507c41a
Merge pull request #2253 from 0xProject/fix/t8
...
Ownership Transferred Event
2019-10-10 16:58:08 -07:00
Alex Towle
65f2626544
@0x:contracts-utils Updated the OwnershipTransferred event to be closer to OpenZeppelin's event
2019-10-10 10:58:58 -07:00
Greg Hysen
361576814c
Removed loadSyncedBalance and loadUnsyncedBalance
2019-10-10 15:51:24 +09:00
Amir Bandeali
7e58385a78
Separate immutable contracts, only inherit as needed
2019-10-10 15:00:35 +09:00
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
Lawrence Forman
a22ba8647c
Update changelogs
2019-10-10 09:41:57 +09:00
Lawrence Forman
22fc0b4337
@0x/contracts-staking: Add another LibFixedMath.add() test.
2019-10-10 09:31:53 +09:00
Lawrence Forman
063d6ff24e
@0x/contracts-staking: Add more overflow safeguards to LibFixedMath.
2019-10-10 09:16:01 +09:00
Lawrence Forman
a42f3d189c
@0x/contracts-staking: Implement better overflow detection in LibFixedMath.
2019-10-10 09:16:01 +09:00
Alex Towle
7815da7257
@0x:contracts-utils Addressed review feedback
2019-10-09 10:49:38 -07: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
Alex Towle
dc0a78434d
@0x:contracts-utils Updated files
2019-10-08 19:27:39 -07:00
Alex Towle
d1b0384aef
@0x:contracts-utils Added an event for ownership transfers
2019-10-08 19:22:27 -07: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
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
