crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,591 Commits 83 Branches 5,211 Tags
Commit Graph

472 Commits

Author SHA1 Message Date
Amir Bandeali
e5e68de2d7 Use != instead of > in loops, add sanity checks to market fill functions 2018-07-23 10:02:51 -05:00
Amir Bandeali
dcc0908617 Add more tests and fixes 2018-07-23 10:02:51 -05:00
Amir Bandeali
0a976a3fb8 Get actual gasPrice from transaction instead of setting default 2018-07-23 10:00:23 -05:00
Amir Bandeali
3506ec1caa Use transferFrom instead of safeTransferFrom 2018-07-23 10:00:23 -05:00
Amir Bandeali
1f0e819756 Fix minimal tests 2018-07-23 10:00:23 -05:00
Amir Bandeali
c2ae9f62a4 Add tests to verify ZRX_ASSET_DATA 2018-07-23 09:34:47 -05:00
Amir Bandeali
d8b44283a2 Move example contracts into new examples dir 2018-07-23 09:34:47 -05:00
Amir Bandeali
195d11f9d0
Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback 
Removed receiverData and `onReceive` callback from ERC721 proxy.
 2018-07-22 18:14:09 -05:00
Greg Hysen
9aa49e59d0 Fixed merge errors 2018-07-18 16:44:24 +02:00
Greg Hysen
86328af6b7 Fixed merge error 2018-07-18 16:27:26 +02:00
Greg Hysen
36c27bdbf8 Ran prettier 2018-07-18 16:18:54 +02:00
Greg Hysen
e1a9f3435f Removed receiverData from ERC721 Proxy Id generation 2018-07-18 15:52:14 +02:00
Greg Hysen
9f74feb347 Removed receiverData and onReceive callback from ERC721 proxy. 2018-07-18 15:50:58 +02:00
Leonid Logvinov
5044fe4fe4
Merge branch 'v2-prototype' into feature/order-watcher-v2 2018-07-18 15:40:45 +02:00
Leonid Logvinov
c71781d9ab
Merge 2018-07-18 15:38:10 +02:00
Fabio Berger
e2fb49a8f8
Merge pull request #884 from 0xProject/export-more-0x.js 
Export missing V2 pieces from 0x.js
 2018-07-18 15:18:54 +02:00
Leonid Logvinov
f3241ff86a
Merge pull request #883 from 0xProject/feature/tslint-improvements 
New tslint rules
 2018-07-18 14:54:47 +02:00
Fabio Berger
004b1f5288 Fix prettier 2018-07-18 14:53:31 +02:00
Fabio Berger
83747934ad Fix linter 2018-07-18 12:11:11 +02:00
Fabio Berger
7f90f5ecd4 merge v2-prototype 2018-07-18 12:04:57 +02:00
Fabio Berger
12f02b9814 Rename decodeAssetDataId to decodeAssetProxyId for consistency 2018-07-18 11:49:30 +02:00
Fabio Berger
25160d7344 Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want them exported 2018-07-18 11:32:01 +02:00
Amir Bandeali
caa5b4e342 Add tests for getOrderInfo and getOrdersInfo 2018-07-17 13:59:14 -07:00
Fabio Berger
f8dbf57582 Rename assetProxyUtils to assetDataUtils 2018-07-17 15:26:55 +02:00
Leonid Logvinov
bf8ac3b9e6
Fix tslint issues 2018-07-17 12:59:02 +02:00
Alex Browne
9828fa335e
Fix bugs having to do with block timestamps and order expirationTimes 2018-07-16 18:41:37 -07:00
Jacob Evans
81b4f4928d
Remove extra ERC20ProxyId from Forwarder constructor 2018-07-11 20:16:59 +10:00
Amir Bandeali
092ca6bcf5 Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes 2018-07-10 11:24:22 -07:00
Leonid Logvinov
faf5c84082
Fix imports 2018-07-06 11:21:49 +02:00
Leonid Logvinov
b21f6e4d86
Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP 
V2 contract wrappers
 2018-07-06 12:10:55 +03:00
Jacob Evans
bc52303402
Types: Move Forwarder Revert Reason into types package 2018-07-06 18:26:59 +10:00
Jacob Evans
2da705e81c
Forwarder specify the revert reasons 2018-07-06 18:09:56 +10:00
Jacob Evans
a0601cd052
Forwarder fix linter error 2018-07-06 17:44:17 +10:00
Jacob Evans
ed2c06508b
Update to new assertions 2018-07-06 17:43:15 +10:00
Jacob Evans
03b3d74748
Merge pull request #522 from 0xProject/feature/contracts/forwarder 
Forwarding contract
 2018-07-06 16:29:56 +10:00
Jacob Evans
0557d6a9bf
Forwarding contract (squashed commits) 2018-07-06 15:30:07 +10:00
Leonid Logvinov
ba9d3cbdb8
Make it possible to configure block polling interval in base contract wrapper 2018-07-05 15:56:31 +02:00
Alex Browne
dc956020ef
Move NodeType caching out of web3-wrapper and into our internal code 2018-07-03 12:57:11 -07:00
Alex Browne
d2ebf4a777
Add TransactionReceiptStatus type to ethereum-types 2018-07-03 10:49:35 -07:00
Alex Browne
5b64b3ea93
Improve robustness of revert reason assertions 2018-07-02 18:57:33 -07:00
Fabio Berger
d861caca23 Fix bug where 18 decimal tokens instead of 5 decimal tokens created 2018-07-02 12:31:02 +02:00
Fabio Berger
af1e4574a8 Disable custom-no-magic-number for block 2018-07-02 11:39:07 +02:00
Fabio Berger
7b806fe84d Remove unused variable 2018-07-02 11:18:48 +02:00
Fabio Berger
de9f0732a0 Merge branch 'v2-prototype' into fix/five_decimal_scenario 
* v2-prototype: (75 commits)
  Update relayer grid tiles to use Text
  Fix build
  Update file structure
  Update 2.0.0 artifacts
  Move ledgerhq module declarations to typescript-typings
  Export LedgerEthereumClient type in subproviders
  Update artifacts
  Add logging and updated artifacts
  Fix migrations
  Run prettier
  Add Kovan artifacts
  Use ledger subprovider
  Add Kovan migrations
  Remove state variable from Link component in Portal
  Make registerAssetProxy append only
  Update staging api link
  Change getTransactionReceipt to awaitTransactionMined
  Move /docs route to the end
  Remove extra call to scrollIntoView for wallet in onboarding
  Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes
  ...
 2018-07-02 11:12:01 +02:00
Fabio Berger
018a437d62 Print out entire orderFill scenario 2018-07-02 10:51:28 +02:00
Amir Bandeali
41064adc66 Fix build 2018-06-29 18:20:44 -07:00
Amir Bandeali
2fcc36bbad Update file structure 2018-06-29 18:05:40 -07:00
Amir Bandeali
d4852092b8 Make registerAssetProxy append only 2018-06-29 16:25:16 -07:00
Alex Browne
6cf39896f1
Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes 2018-06-29 13:46:42 -07:00
Amir Bandeali
44b6adaa29 Fix deployment to geth 2018-06-29 13:33:22 -07:00