Amir Bandeali
10f8051835
Merge pull request #2274 from 0xProject/feat/staking/separate-function-logic
...
Separate finalization from withdrawing rewards
2019-10-22 10:36:04 -07:00
Amir Bandeali
e7dc7167d0
Sync delegatedStakeToPoolByOwner whenever _withdrawAndSyncDelegatorRewards is called
2019-10-22 09:38:18 -07:00
Amir Bandeali
359b804001
Add test for withdrawing rewards before epoch is finalized
2019-10-21 22:27:06 -07:00
Amir Bandeali
fd9084b345
Add PoolNotFinalizedError rich revert
2019-10-21 22:27:06 -07:00
Amir Bandeali
44dac2cd80
Fix tests that assume touching stake will finalize pool
2019-10-21 22:27:06 -07:00
Amir Bandeali
a66ea2bf74
Assert that pool has been finalized in _withdrawAndSyncDelegatorRewards rather than calling finalizePool
2019-10-21 22:27:06 -07:00
Amir Bandeali
a362e9d2d8
Use safeMath where possible
2019-10-21 22:27:06 -07:00
Amir Bandeali
1885957bd3
Update tests to start at epoch 1
2019-10-21 22:27:06 -07:00
Amir Bandeali
1a409c3731
Initialize currentEpoch at 1 instead of 0
2019-10-21 22:27:06 -07:00
Amir Bandeali
7b7c64fc6a
Add assertion function that checks if pool was finalized last epoch
2019-10-21 22:27:06 -07:00
Michael Zhu
102fcd3fb8
export actor classes
2019-10-21 11:17:53 -07:00
Michael Zhu
566e05aea4
typo
2019-10-21 11:17:53 -07:00
Michael Zhu
f014370531
document mixin constructor params
2019-10-21 11:17:53 -07:00
Michael Zhu
dfbbe9daa2
address comments
2019-10-21 11:17:53 -07:00
Michael Zhu
6b653fb00d
prettier gdi
2019-10-21 11:17:53 -07:00
Michael Zhu
21cf2319d5
rename some stuff
2019-10-21 11:17:53 -07:00
Michael Zhu
4210477e71
Introduce actor mixin pattern
2019-10-21 11:17:53 -07:00
Michael Zhu
93b02e93b9
juggling some files around
2019-10-21 11:16:14 -07:00
Michael Zhu
f4cb8cfb7e
Support arbitrary # of tokens in DeploymentManager
2019-10-21 11:16:14 -07:00
Xianny
ce9f051d42
Create @0x/contracts-tests ( #2261 )
...
* Create @0x/contracts-tests
* Move tests from @0x/contracts-dev-utils
2019-10-21 10:23:46 -07:00
Amir Bandeali
083216a0c6
Merge pull request #2271 from 0xProject/feat/3.0/zero-ex-governor
...
Rename AssetProxyOwner to ZeroExGovernor
2019-10-19 17:05:07 -07:00
Amir Bandeali
820b40e227
Import ZeroExGovernor instead of AssetProxyOwner in testnet migrations
2019-10-18 16:31:38 -07:00
mzhu25
59a38a8db0
Merge pull request #2269 from 0xProject/refactor/balance-stores
...
BalanceStore++
2019-10-18 09:01:33 -07:00
Lawrence Forman
d0884dcb4d
Merge pull request #2267 from 0xProject/feat/3.0/staking/MixinStake-unit-tests
...
Create MixinStake unit tests
2019-10-18 11:41:18 -04:00
Lawrence Forman
c7ca625408
@0x/contracts-staking: Fix MixinStake unit tests typo.
2019-10-18 10:45:07 -04:00
Lawrence Forman
e46f51339a
@0x/contracts-staking: Address review comments.
2019-10-18 10:42:47 -04:00
Michael Zhu
b45ec47eee
address comments
2019-10-17 19:53:43 -07:00
Amir Bandeali
c50cbd7a75
Rename AssetProxyOwner to ZeroExGovernor throughout all contracts packages
2019-10-17 17:41:54 -07:00
Amir Bandeali
5ddc35fdf2
Rename AssetProxyOwner to ZeroExGovernor
2019-10-17 17:41:54 -07:00
Amir Bandeali
d6c064b9c3
Merge pull request #2224 from 0xProject/feat/3.0/testnet-migrations
...
3.0 testnet migrations
2019-10-17 17:38:09 -07:00
Amir Bandeali
caf6329bb3
Merge branch '3.0' into feat/3.0/testnet-migrations
2019-10-17 17:13:12 -07:00
Lawrence Forman
008938cf5b
@0x/contracts-staking: Check order of increase and derease balance operations in MixinStake unit tests.
2019-10-17 14:09:46 +10:00
Fabio B
3fd29656cb
Merge pull request #2268 from 0xProject/addERC1155MintableSupport
...
Add erc1155 mintable support
2019-10-17 11:50:02 +08:00
Michael Zhu
ffac52f42e
lint
2019-10-16 20:19:04 -07:00
fabioberger
9114510c00
Add enum-naming linter ignore to wrappers to fix linter issue with URL in ERC1155Mintable
2019-10-17 12:16:42 +09:00
fabioberger
2dbda6fc42
Deploy ERC1155Mintable in migration
2019-10-17 12:16:08 +09:00
fabioberger
eae4001622
Update ganache-cli version in migration dockerfile
2019-10-17 12:16:08 +09:00
fabioberger
727d0498b6
Export ERC1155Mintable from abi-gen-wrapper
2019-10-17 12:16:08 +09:00
fabioberger
e43f2d39bf
Add ERC1155Mintable to artifacts and abi-gen-wrappers packages
2019-10-17 12:16:08 +09:00
Michael Zhu
cde0169733
Update BlockchainBalanceStore to not rely on erc*_wrappers + better balance equality assertions
2019-10-16 18:46:55 -07:00
Xianny
0e90b0e7d0
Make wrappers small again ( #2243 )
...
* introduce --debug option to abi-gen and remove debug functions from @0x/abi-gen-wrappers
* make evmExecAsync protected; ignore deployedBytecode in doc comment
* trim deployedBytecode so it's undefined unless a contract has pure functions
* remove validateAndSendTransactionAsync
* Create `AwaitTransactionSuccessOpts` and `SendTransactionOpts` types
* Remove duplicate types `IndexedFilterValues`, `DecodedLogEvent`, `EventCallback` from `@0x/base-contract`
2019-10-16 09:38:34 -07:00
Lawrence Forman
b793a31cdd
@0x/contracts-staking: Create MixinStake unit tests.
2019-10-16 22:53:36 +10:00
James Towle
23198174f3
Merge pull request #2254 from 0xProject/fix/t14
...
Add SafeMath to Multisig
2019-10-15 15:40:48 -07:00
Alex Towle
523bc3f951
Updated Changelogs
2019-10-15 15:00:01 -07:00
Alex Towle
41d99e77c7
@0x:contracts-utils Removed SafeMath and the use of the contract throughout contracts/
2019-10-15 14:31:48 -07:00
Alex Towle
90193c8197
@0x:contracts-multisig Changed SafeMath to LibSafeMath
2019-10-15 14:31:48 -07:00
Alex Towle
6f5c62914e
@0x:contracts-multisig Switched to SafeMath in pastTimeLock
2019-10-15 14:31:48 -07:00
James Towle
17faeae47d
Merge pull request #2265 from 0xProject/fix/3.0/c18
...
Fix/3.0/c18
2019-10-15 11:31:46 -07:00
Alex Towle
7283a16710
@0x:contracts-utils Updated changelog
2019-10-14 11:57:02 -07:00
Alex Towle
52c3dc4ad8
@0x:contracts-utils Fixed and improved the LibBytes tests
2019-10-14 11:54:02 -07:00
