45 Commits

Author SHA1 Message Date
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
Leonid Logvinov
72b2a1c66f
Implement new artifacts format 2018-05-07 10:23:08 +02:00
Fabio Berger
64c5c5eb40 Fix comments 2018-04-18 15:22:20 +09:00
Fabio Berger
f892b7dbf6 Move NULL_BYTES to @0xproject/utils 2018-04-11 22:00:54 +09:00
Leonid Logvinov
d72b7299c6
Move common types out of web3 types 2018-03-27 17:56:21 +02:00
Leonid Logvinov
03902b0b26
Merge pull request #419 from 0xProject/fix/deployer-args
Improve an error message when an incorrect number of constructor param…
2018-03-08 01:25:31 -08:00
Leonid Logvinov
2d0940589e
Initial implementation of Arbitrage contract with tests 2018-03-01 12:21:08 -08:00
Leonid Logvinov
b6a133cc64
Improve an error message when an inorrect number of constructor params is passed 2018-02-27 14:42:49 -08:00
Leonid Logvinov
0bb0bff0b3
Change backend for contracts contracts 2018-02-27 12:06:02 -08:00
Leonid Logvinov
747732118c
Fix namings 2018-02-27 12:06:02 -08:00
Leonid Logvinov
93b2736d65
Use the same templates as 0x.js 2018-02-27 12:05:46 -08:00
Leonid Logvinov
568e4d33f2
Use Order and SignedOrder type from 0x.js 2018-02-07 13:41:30 +01:00
Leonid Logvinov
fd004032cb
Introduce SignedOrder class and remove type assertions 2018-02-07 12:22:22 +01:00
Leonid Logvinov
4b6324050d
Make orderHashHex a getter instead of a property 2018-02-07 11:59:40 +01:00
Leonid Logvinov
a96e3f3222 Add missing async 2018-02-06 17:27:47 -08:00
Leonid Logvinov
4cc5bbaf19 Change utils 2018-02-06 17:27:47 -08:00
Amir Bandeali
218876ac19 Fix artifacts path 2018-02-06 17:26:13 -08:00
Amir Bandeali
d5d6079b67 Rename directories 2018-02-02 09:39:08 -08:00
Amir Bandeali
bb4c8bf8eb Rename previous contracts, fix imports, add nested file structure 2018-02-02 09:39:08 -08:00
Leonid Logvinov
9d62e5fb6f
Use an enum for contract name 2018-01-30 16:01:37 +01:00
Leonid Logvinov
1e9147b8bb
Normalize the dependencies 2018-01-30 16:01:37 +01:00
Leonid Logvinov
a17091b394
Make awaitTransactionMinedAsync non-generic again 2018-01-30 16:01:36 +01:00
Leonid Logvinov
387363283c
Remove truffle from tests 2018-01-30 16:01:36 +01:00
Leonid Logvinov
709026bf1a
Refactor contracts tests to not use injected web3 instance 2018-01-30 16:01:36 +01:00
Leonid Logvinov
6463cda204
Remove truffle from tokenTransferProxy tests 2018-01-30 16:01:35 +01:00
Leonid Logvinov
4b9501318d
Move deployer to a separate package 2018-01-18 14:18:51 +01:00
Leonid Logvinov
e2ef0c5b94
Fix linter errors 2018-01-04 15:12:32 +01:00
Leonid Logvinov
4dfa720f2d
Use configured version of bignumber in all packages 2018-01-04 12:38:19 +01:00
Leonid Logvinov
e744e4cd98
Apply prettier config 2018-01-03 11:37:38 +01:00
Brandon Millman
23052a5c2e Merge branch 'development' into fix/underscorePrivate
* development: (29 commits)
  Move call to error reporter to end of handler so that even if reporting the error takes a while, it doesn't block the UI
  Update outdated WETH ranges
  Fix conditional
  Fix top-padding
  Publish
  Update CHANGELOGs
  Add slashes to base URLs
  Fix linter issue
  Fix WETH symbol
  Update snapshot and artifacts
  Replace our EtherTokens with WETH9 from maker
  Fix test description
  Fix a typo
  Add err==null assertions
  Add WETH9 tests
  Use the new snapshot including WETH9 and it's artifacts
  Add WETH9 and mirations
  Fix WETH events watching
  Fix a typo
  Init the _etherTokenContractsByAddress
  ...
2017-12-20 19:07:54 -05:00
Brandon Millman
cb11aec84d
Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors 2017-12-20 15:30:25 +01:00
Leonid Logvinov
9ed05f56d3
Replace our EtherTokens with WETH9 from maker 2017-12-20 14:53:38 +01:00
Leonid Logvinov
126048bac9
Fix connect unused vars 2017-12-15 13:58:30 +01:00
Leonid Logvinov
cb596c1413
Move more shared utils into utils package and reuse them 2017-12-14 15:47:02 +01:00
Amir Bandeali
b97f140b78 Add gas limits to failing tests 2017-12-12 15:05:30 -08:00
Amir Bandeali
2cc410e61f Update 0x.js version, fix build errors 2017-12-12 15:05:27 -08:00
Amir Bandeali
548fda8dba Add updated contracts, reorganize contract file structure 2017-12-12 15:02:05 -08:00
Amir Bandeali
b58bf8259d Add tests for ERC20Token and EtherToken_v2 2017-12-12 15:02:05 -08:00
Amir Bandeali
e6862e9739 Fix errors with new testrpc version 2017-12-12 15:02:04 -08:00
Amir Bandeali
7008e882c0 Add version to new EtherToken, fix typos 2017-12-12 15:02:04 -08:00
Leonid Logvinov
f1b267cc9f
Refactor web3Wrapper to a separate package 2017-12-06 20:55:09 +03:00
Amir Bandeali
ca9518c48c Make class methods that don't use 'this' static 2017-11-30 22:11:44 -08:00
Amir Bandeali
e85a69655c Fix indentations 2017-11-30 07:10:18 -08:00
Amir Bandeali
4b3e038323 Add contracts to packages, fix most linting errors 2017-11-30 07:10:18 -08:00