Alex Browne
251218af8b
Use make-promises-safe to catch unhandled rejections in tests
2018-05-16 17:36:37 -07:00
Fabio Berger
839db68571
Fix TSLint rules
2018-05-16 14:59:10 +02:00
Amir Bandeali
9e0471bfbb
Merge branch 'development' into v2-prototype
2018-05-15 15:52:49 -04:00
Leonid Logvinov
b74957acdf
Add missing type definitions
2018-05-14 10:35:13 +02:00
Fabio Berger
d370296e82
Merge branch 'development' into breakUp0xjs
...
* development:
Fix ganache subprovider config
Fix a bug in compiler config precedence
Fix linter errors
Fix templates
Remove unused deployer docs configs
Add a legacy endpoint for the deployer
Add a check for compiler output
Add a comment
Put ARTIFACTS_VERSION in a config
Improve a comment
Remove _applyDefaultsToDeployTxDataAsync
Add a HACK comment
Fix linter issues
Rename deployer to sol-compiler
Remove deployer
Remove deployer from 0x.js and migrations
Configure migrations with a compiler.json
Remove deployer from metacoin and contract tests
Update wallet footer and add remove token functionality
# Conflicts:
# .gitignore
# packages/0x.js/package.json
# packages/0x.js/src/0x.ts
# packages/contracts/package.json
# packages/contracts/test/multi_sig_with_time_lock.ts
# packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
# packages/contracts/util/artifacts.ts
# packages/deployer/test/deployer_test.ts
# packages/migrations/package.json
2018-05-11 12:32:57 +02:00
Leonid Logvinov
e972ed8456
Fix linter errors
2018-05-10 18:12:34 +02:00
Fabio Berger
83dd333eba
Fix tslint errors
2018-05-10 17:55:27 +02:00
Leonid Logvinov
f854f3ee2b
Remove unused deployer docs configs
2018-05-10 17:47:38 +02:00
Leonid Logvinov
75d24dea0e
Fix linter issues
2018-05-10 17:47:38 +02:00
Leonid Logvinov
3d58b38e4e
Remove deployer from metacoin and contract tests
2018-05-10 17:46:57 +02:00
Fabio Berger
cd5f00ac4d
Merge branch 'development' into breakUp0xjs
...
* development: (38 commits)
Add fallback image support to relayer grid tile
Clear relayer grid state when fetching
Configure the compiler to generate artifacts with deployedBytecode
Implement loading and error state for relayer grid
Fallback image for relayer grid tile
Change relayer grid tile to link on header
Display top tokens from backend
Remove overflowZ property from portal
Suggestions and fix bad merge
Fix typo
Only show untracked tokens
Make wallet scrollable
Add token flow
Update The Ocean logo
Fix artifacts paths
Create an artifacts folder
Introduce a var
Add removeHexPrefix util method
CHeck if ABI exists
Improve the readability of the check for should compile
...
# Conflicts:
# .gitignore
# packages/contracts/test/multi_sig_with_time_lock.ts
# packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
# packages/contracts/util/artifacts.ts
2018-05-10 17:08:07 +02:00
Fabio Berger
209266dbed
Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifying library with the same interface
2018-05-09 20:36:28 +02:00
Amir Bandeali
7e7364fc83
Move Authorizable to AssetProxy dir, rename to MixinAuthorizable
2018-05-07 11:20:53 -07:00
Leonid Logvinov
72b2a1c66f
Implement new artifacts format
2018-05-07 10:23:08 +02:00
Amir Bandeali
bbf088d903
Make LibBytes methods internal, add TestLibBytes
2018-05-04 17:00:24 -07:00
Amir Bandeali
0cb357a0e9
Add tests for batchTransferFrom
2018-05-01 13:39:55 -07:00
Amir Bandeali
bbb3d5bb67
Add hard coded proxyId into each AssetProxy
2018-04-30 16:40:27 -07:00
Amir Bandeali
599d34f1c0
Make all lib functions internal, add contracts for testing
2018-04-26 11:11:54 -07:00
Amir Bandeali
9ddec32260
Add tests and comments
2018-04-26 10:56:44 -07:00
Amir Bandeali
185e7d43fb
Add tests
2018-04-26 10:33:37 -07:00
Amir Bandeali
0e0a46f373
Update tests and utils
2018-04-26 10:33:37 -07:00
Fabio Berger
9dc4ec6fb5
Fix prettier
2018-04-25 18:07:22 +09:00
Fabio Berger
0baaf1767b
Fix merge conflict issues
2018-04-24 20:01:04 +09:00
Fabio Berger
b24b98a365
merge v2-prototype
2018-04-24 16:51:32 +09:00
Amir Bandeali
27a44f0e77
Rename variables, create private validation methods in token wrappers
2018-04-23 23:23:01 -07:00
Amir Bandeali
432b064601
Fix tests
2018-04-23 10:50:09 -07:00
Amir Bandeali
afb02b8bd1
Fix and cleanup tests
2018-04-23 09:57:13 -07:00
Amir Bandeali
7d26b96d42
Rename proxyUtils => assetProxyUtils
2018-04-22 18:53:13 -07:00
Amir Bandeali
08208acf53
Rename missed variables
2018-04-22 14:44:56 -07:00
Amir Bandeali
fcef1819b1
Add missing async suffix
2018-04-21 17:31:17 -07:00
Amir Bandeali
3335fc7baf
Rename token => asset
2018-04-21 17:31:17 -07:00
Amir Bandeali
120ca5b1ec
Rename DummyToken => DummyERC20Token
2018-04-21 17:31:17 -07:00
Amir Bandeali
1c94ab7cc3
export proxyUtils instead of individual functions
2018-04-21 17:31:17 -07:00
Amir Bandeali
fe6c77cafb
Remove unused constructor arguments
2018-04-21 15:42:09 -07:00
Greg Hysen
a0c7da95c2
Added tests for (most functions in) LibBytes. The write methods are not currently compatible with our generated contract wrappers.
2018-04-20 13:56:18 -07:00
Greg Hysen
ab13ce96cc
Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less confusion. Also updated the function description.
2018-04-20 13:56:18 -07:00
Greg Hysen
e80f203efc
Inlined decodeMetadata in the proxies and removed encodeMetadata (already exists in Typescript). This simplifies the code.
2018-04-20 13:56:18 -07:00
Greg Hysen
0e3544e1f9
Miscellaneous style changes to the contracts package; specifically tests
2018-04-20 13:56:18 -07:00
Greg Hysen
f4589b5bd4
Ran prettier
2018-04-20 13:56:18 -07:00
Greg Hysen
3b7068e8d0
renaming after tokenTransferProxy was removed
2018-04-20 13:56:18 -07:00
Greg Hysen
c19fb1dffc
Removed ERC20 V1 Proxy + TokenTransferProxy
2018-04-20 13:56:18 -07:00
Greg Hysen
84eddc3d94
switched to constants in default order params.
2018-04-20 13:56:18 -07:00
Greg Hysen
dfe6b2844b
Reverted change that allowed ERC721 transfer proxy to be called with amount 0. This now throws.
2018-04-20 13:56:18 -07:00
Greg Hysen
6be5fe928e
Removed takerTokenAddress and makerTokenAddress from Order struct.
2018-04-20 13:56:18 -07:00
Greg Hysen
167654c9a0
Added clarity to not-authorized test case in dispatcher
2018-04-20 13:56:18 -07:00
Greg Hysen
4d42f64fa3
More testing of common functionality across proxies
2018-04-20 13:56:17 -07:00
Greg Hysen
8d83243378
Updates to proxy tests.
2018-04-20 13:56:17 -07:00
Greg Hysen
e1a74b6bdd
More authorized -> owner in test comments
2018-04-20 13:56:17 -07:00
Greg Hysen
44919c353e
Removed unnecessary deployments in test
2018-04-20 13:56:17 -07:00
Greg Hysen
cf8523da5f
Moved ERC721 FillOrderNoThrow tests into wrapper
2018-04-20 13:56:17 -07:00