Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 2 | -8/+17 |
| | |||||
* | fix formatting | Fabio Berger | 2017-06-01 | 1 | -4/+2 |
| | |||||
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 2 | -1/+23 |
|\ | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| * | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 2 | -1/+5 |
| | | |||||
| * | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 2 | -0/+4 |
| | | |||||
| * | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 2 | -0/+14 |
| | | |||||
* | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 2 | -10/+10 |
|/ | |||||
* | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 4 | -7/+6 |
| | |||||
* | rename signed_order_schema to order_schemas | Fabio Berger | 2017-06-01 | 4 | -3/+3 |
| | |||||
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -4/+0 |
|\ | |||||
| * | Fix types hell with, chai and chai-as-promised | Leonid Logvinov | 2017-06-01 | 1 | -4/+0 |
| | | |||||
* | | Add convertToJSONSchemaCompatibleObject method | Fabio Berger | 2017-06-01 | 3 | -2/+15 |
| | | |||||
* | | move external imports to top | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
|/ | |||||
* | make bigNumberConfig a module | Fabio Berger | 2017-06-01 | 2 | -9/+13 |
| | |||||
* | Fix linter errors | Leonid Logvinov | 2017-06-01 | 1 | -0/+4 |
| | |||||
* | Add dirty-chai | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | |||||
* | Type estimateGas | Leonid Logvinov | 2017-06-01 | 1 | -4/+6 |
| | |||||
* | Remove TxData | Leonid Logvinov | 2017-06-01 | 1 | -5/+1 |
| | |||||
* | Temporarily fix gas extimation | Leonid Logvinov | 2017-06-01 | 1 | -0/+13 |
| | |||||
* | Add setDefaultAccount | Leonid Logvinov | 2017-06-01 | 2 | -0/+10 |
| | |||||
* | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 2 | -15/+14 |
|\ | |||||
| * | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 2 | -15/+14 |
| |\ | |||||
| | * | Add TxOpts type | Fabio Berger | 2017-05-31 | 1 | -1/+6 |
| | | | |||||
| | * | remove InternalError type since this error could surface through the public ↵ | Fabio Berger | 2017-05-31 | 2 | -7/+3 |
| | | | | | | | | | | | | interface | ||||
| | * | Remove superfluous undefined check | Fabio Berger | 2017-05-31 | 1 | -4/+2 |
| | | | |||||
| | * | Add full stop to comments | Fabio Berger | 2017-05-31 | 1 | -2/+2 |
| | | | |||||
* | | | Fix linter errors | Leonid Logvinov | 2017-05-31 | 3 | -4/+4 |
| | | | |||||
* | | | Don't return contract response | Leonid Logvinov | 2017-05-31 | 1 | -2/+1 |
| | | | |||||
* | | | Set bignumber config | Leonid Logvinov | 2017-05-31 | 2 | -0/+11 |
| | | | |||||
* | | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 4 | -0/+131 |
|\| | | |||||
| * | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 2 | -1/+17 |
| |/ | |||||
| * | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 3 | -4/+34 |
| | | |||||
| * | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 2 | -1/+34 |
| | | |||||
| * | use token instead of erc20 | Fabio Berger | 2017-05-30 | 1 | -3/+3 |
| | | |||||
| * | rename ERC20Contract to TokenContract | Fabio Berger | 2017-05-30 | 2 | -5/+5 |
| | | |||||
| * | rename erc20Wrapper to tokenWrapper to be more generic in case we end up ↵ | Fabio Berger | 2017-05-30 | 2 | -7/+30 |
| | | | | | | | | supporting another spec | ||||
| * | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 4 | -13/+44 |
| |\ | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts | ||||
| * \ | Merge branch 'tokenRegistry' into erc20Wrapper | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 3 | -0/+37 |
| | | | | |||||
* | | | | Refactor getOrderHash to accept order as an object | Leonid Logvinov | 2017-05-30 | 1 | -29/+16 |
| | | | | |||||
* | | | | Remove spaces in types | Leonid Logvinov | 2017-05-30 | 1 | -4/+0 |
| | | | | |||||
* | | | | Add isBigNumber argument assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 7 | -6/+109 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Remove mention of internal cleanup from public comment | Fabio Berger | 2017-05-30 | 1 | -2/+1 |
| | | | | |||||
| * | | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter ↵ | Fabio Berger | 2017-05-30 | 2 | -13/+15 |
| | | | | | | | | | | | | | | | | that instantiates contract instance if not already instantiated | ||||
| * | | | remove unused declarations | Fabio Berger | 2017-05-30 | 1 | -3/+0 |
| | | | | |||||
| * | | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+0 |
| | | | | |||||
| * | | | improve comment | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make tokenRegistry contract instantiation lazy and clear it on provider update | Fabio Berger | 2017-05-30 | 2 | -4/+15 |
| | | | | |||||
| * | | | rename invalidateExchangeContract to invalidateContractInstance | Fabio Berger | 2017-05-30 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into dontReinstantiateContractInstances | Fabio Berger | 2017-05-30 | 6 | -4/+73 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into tokenRegistry | Fabio Berger | 2017-05-30 | 2 | -5/+4 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts | ||||
| | | * \ \ | Merge pull request #22 from 0xProject/regex-fix | Fabio Berger | 2017-05-30 | 1 | -4/+3 |
| | | |\ \ \ | | | | | | | | | | | | | | | Fix the empty code regex | ||||
| | | | * | | | Fix the empty code regex | Leonid Logvinov | 2017-05-30 | 1 | -4/+3 |
| | | | | | | | |||||
| | * | | | | | Improve type definitions | Fabio Berger | 2017-05-30 | 1 | -2/+6 |
| | | | | | | | |||||
| | * | | | | | Add TokenMetadata type | Fabio Berger | 2017-05-30 | 2 | -2/+5 |
| | | | | | | | |||||
| | * | | | | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch 'removeSrcFilesNotUsedByTests' into tokenRegistry | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| | | |||||
| | * | | | Add tests for getTokensAsync including schema validation | Fabio Berger | 2017-05-30 | 2 | -0/+14 |
| | | | | | |||||
| | * | | | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 3 | -0/+49 |
| | | | | | |||||
| * | | | | Add setProvider method to 0x.js that updates the web3 provider and ↵ | Fabio Berger | 2017-05-30 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | invalidates any contractInstances instantiated with the old provider | ||||
| * | | | | Lazily instantiate exchangeContract and store as instance variable instead ↵ | Fabio Berger | 2017-05-30 | 2 | -3/+17 |
| | |_|/ | |/| | | | | | | | | | | of re-instantiating on every call | ||||
| * | | | make web3Wrapper a private instance variable | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Add throwErrorLogsAsErrors | Leonid Logvinov | 2017-05-30 | 1 | -6/+10 |
| | | | |||||
* | | | Fix order type | Leonid Logvinov | 2017-05-30 | 1 | -1/+0 |
| | | | |||||
* | | | Fix orderSchema | Leonid Logvinov | 2017-05-30 | 1 | -4/+4 |
| | | | |||||
* | | | Add fillAmount parameter | Leonid Logvinov | 2017-05-30 | 1 | -2/+3 |
| | | | |||||
* | | | Make fillOrderAsync accept signedOrder instead of a shit-ton of params | Leonid Logvinov | 2017-05-30 | 1 | -35/+21 |
| | | | |||||
* | | | Change BigNumber schema to Number schema | Leonid Logvinov | 2017-05-30 | 1 | -2/+2 |
| | | | |||||
* | | | Change BigNumber schema to Number schema | Leonid Logvinov | 2017-05-30 | 1 | -11/+10 |
| | | | |||||
* | | | Add id to signedOrderSchema | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 |
| | | | |||||
* | | | Add isBoolean assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+3 |
| | | | |||||
* | | | Add signedOrderSchema and all subschemas | Leonid Logvinov | 2017-05-30 | 2 | -1/+56 |
| | | | |||||
* | | | Add Order and SignedOrder types | Leonid Logvinov | 2017-05-30 | 1 | -0/+23 |
| | | | |||||
* | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -1/+1 |
|\| | | |||||
| * | | Reverts: 7e96b45ea0c51ca5589640018172a91a35596148 which broke this regex for ↵ | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| |/ | | | | | | | the `0x0` edge-case | ||||
* | | Finish ecSignature renaming | Leonid Logvinov | 2017-05-30 | 1 | -3/+3 |
| | | |||||
* | | Add assertions for parameters | Leonid Logvinov | 2017-05-30 | 1 | -1/+15 |
| | | |||||
* | | Move field declaration to the begining of the class | Leonid Logvinov | 2017-05-30 | 1 | -8/+8 |
| | | |||||
* | | Add initial implementation of fillOrderAsync | Leonid Logvinov | 2017-05-30 | 2 | -1/+96 |
| | | |||||
* | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsync | Leonid Logvinov | 2017-05-30 | 2 | -6/+14 |
|/ | |||||
* | Lowercase schema names | Fabio Berger | 2017-05-30 | 4 | -12/+12 |
| | |||||
* | improve comment | Fabio Berger | 2017-05-29 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into addSignOrderHashAndTests | Fabio Berger | 2017-05-29 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | # Conflicts: # package.json # src/globals.d.ts # test/0x.js_test.ts | ||||
| * | Merge pull request #16 from 0xProject/umd-tests | Fabio Berger | 2017-05-29 | 1 | -1/+2 |
| |\ | | | | | | | Umd tests | ||||
| | * | Address feedback | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 |
| | | | |||||
| | * | Make eventually a PromisedAssertion | Leonid Logvinov | 2017-05-29 | 1 | -1/+2 |
| | | | |||||
* | | | fix declaration | Fabio Berger | 2017-05-29 | 1 | -1/+1 |
| | | | |||||
* | | | Use disable-next-line instead of disable and always put rule that is being ↵ | Fabio Berger | 2017-05-29 | 1 | -2/+1 |
| | | | | | | | | | | | | disabled | ||||
* | | | Add declarations for find-versions and compare-versions | Fabio Berger | 2017-05-29 | 1 | -2/+12 |
| | | | |||||
* | | | Port over signOrderHashAsync | Fabio Berger | 2017-05-29 | 4 | -1/+71 |
|/ / | |||||
* / | Standardize all comments | Fabio Berger | 2017-05-29 | 1 | -4/+4 |
|/ | |||||
* | Fix imports | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 |
| | |||||
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 11 | -0/+0 |
| | |||||
* | Merge branch 'master' of github.com:0xProject/0x.js | Fabio Berger | 2017-05-29 | 15 | -25/+3199 |
|\ | | | | | | | | | | | # Conflicts: # src/ts/0x.js.ts # src/ts/utils/utils.ts | ||||
| * | Refactor to ternary | Fabio Berger | 2017-05-27 | 1 | -6/+1 |
| | | |||||
| * | Make zero address regex stricter | Leonid Logvinov | 2017-05-27 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'implementFirstExchangeMethod' of github.com:0xProject/0x.js ↵ | Fabio Berger | 2017-05-27 | 1 | -1/+1 |
| |\ | | | | | | | | | | into implementFirstExchangeMethod | ||||
| | * | Simplify zero address regex | Leonid Logvinov | 2017-05-27 | 1 | -1/+1 |
| | | | |||||
| * | | remove todo | Fabio Berger | 2017-05-27 | 1 | -1/+0 |
| |/ | |||||
| * | remove outdated comment | Fabio Berger | 2017-05-26 | 1 | -2/+0 |
| | | |||||
| * | return undefined if not address found | Fabio Berger | 2017-05-26 | 1 | -3/+3 |
| | | |||||
| * | Add missing return types | Fabio Berger | 2017-05-26 | 2 | -3/+3 |
| | | |||||
| * | move console log into UNHANDLED_ERROR clause | Fabio Berger | 2017-05-26 | 1 | -1/+1 |
| | | |||||
| * | rename networkId to networkIdIfExists | Fabio Berger | 2017-05-26 | 1 | -2/+4 |
| | | |||||
| * | remove comment | Fabio Berger | 2017-05-26 | 1 | -1/+0 |
| | | |||||
| * | import re-order | Fabio Berger | 2017-05-26 | 1 | -2/+2 |
| | | |||||
| * | Setup blockchain snapshotting before/after every test, implemented unit ↵ | Fabio Berger | 2017-05-26 | 1 | -0/+5 |
| | | | | | | | | tests for exchangeWrapper.isValidSignature | ||||
| * | Add missing semi-colon | Fabio Berger | 2017-05-26 | 1 | -1/+1 |
| | | |||||
| * | cleanup isValidSignature method | Fabio Berger | 2017-05-26 | 1 | -5/+6 |
| | | |||||
| * | Add missing require | Fabio Berger | 2017-05-26 | 1 | -0/+1 |
| | | |||||
| * | Spacing and import re-order | Fabio Berger | 2017-05-26 | 1 | -3/+4 |
| | | |||||
| * | Remove unused bignum import | Leonid Logvinov | 2017-05-26 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' into implementFirstExchangeMethod | Fabio Berger | 2017-05-26 | 4 | -1/+71 |
| |\ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # src/ts/0x.js.ts # src/ts/globals.d.ts # src/ts/types.ts | ||||
| * | | Fix web3 imports again | Fabio Berger | 2017-05-26 | 3 | -3/+3 |
| | | | |||||
| * | | Fix web3 imports | Fabio Berger | 2017-05-26 | 3 | -3/+3 |
| | | | |||||
| * | | Change the order of params in isValidSignatureAsync to be consistent | Leonid Logvinov | 2017-05-26 | 1 | -4/+4 |
| | | | |||||
| * | | Fix exchange type | Leonid Logvinov | 2017-05-26 | 1 | -1/+1 |
| | | | |||||
| * | | Remove unused imports | Leonid Logvinov | 2017-05-26 | 1 | -3/+0 |
| | | | |||||
| * | | Add initial exchange contract function, set up web3Wrapper, added types and ↵ | Fabio Berger | 2017-05-26 | 8 | -18/+249 |
| | | | | | | | | | | | | utils | ||||
| * | | Add npm command to update contact artifacts | Fabio Berger | 2017-05-26 | 6 | -0/+2958 |
| | | | |||||
* | | | Move bigNumberToBN to utils module | Fabio Berger | 2017-05-29 | 2 | -17/+20 |
| |/ |/| | |||||
* | | Address feedback | Leonid Logvinov | 2017-05-26 | 3 | -6/+4 |
| | | |||||
* | | Address feedback | Leonid Logvinov | 2017-05-26 | 2 | -22/+36 |
| | | |||||
* | | Port getOrderHash | Leonid Logvinov | 2017-05-25 | 4 | -0/+69 |
|/ | |||||
* | Get rid of ETH | Leonid Logvinov | 2017-05-25 | 1 | -4/+4 |
| | |||||
* | Fix comment | Leonid Logvinov | 2017-05-25 | 1 | -1/+1 |
| | |||||
* | Fix tests | Leonid Logvinov | 2017-05-25 | 1 | -1/+1 |
| | |||||
* | Fix braces | Leonid Logvinov | 2017-05-25 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into isValidOrderHash | Leonid | 2017-05-25 | 2 | -2/+38 |
|\ | |||||
| * | Add toUnitAmount and toBaseUnitAmount static helpers and tests | Fabio Berger | 2017-05-25 | 2 | -0/+39 |
| | | |||||
* | | Address feedback | Leonid Logvinov | 2017-05-25 | 2 | -7/+8 |
| | | |||||
* | | Remove type aliases | Leonid Logvinov | 2017-05-25 | 3 | -8/+7 |
| | | |||||
* | | Merge branch 'master' into isValidOrderHash | Leonid | 2017-05-25 | 5 | -4/+50 |
|\| | |||||
| * | Merge branch 'master' into addSchemas | Fabio Berger | 2017-05-25 | 1 | -0/+15 |
| |\ | | | | | | | | | | | | | # Conflicts: # package.json | ||||
| * | | rename v to validator for clarity | Fabio Berger | 2017-05-25 | 1 | -6/+6 |
| | | | |||||
| * | | Pretty print passed in order and schema validation errors in thrown assertion | Fabio Berger | 2017-05-25 | 1 | -2/+4 |
| | | | |||||
| * | | Improve ECSignature schema to check signature parameters and that v is 27 or 28 | Fabio Berger | 2017-05-25 | 2 | -4/+15 |
| | | | |||||
| * | | Add schema validation and assertion, create ECSignature schema | Fabio Berger | 2017-05-25 | 5 | -4/+37 |
| | | | |||||
* | | | Remove HexString type | Leonid Logvinov | 2017-05-25 | 2 | -7/+6 |
| | | | |||||
* | | | Port isValidOrderHash and tests | Leonid Logvinov | 2017-05-25 | 3 | -3/+16 |
| |/ |/| | |||||
* | | More descriptive comment | Leonid Logvinov | 2017-05-25 | 1 | -1/+5 |
| | | |||||
* | | Add generateSalt and tests for it | Leonid Logvinov | 2017-05-25 | 1 | -0/+11 |
|/ | |||||
* | Add assertions library and add them for all function args | Fabio Berger | 2017-05-25 | 2 | -0/+37 |
| | |||||
* | Address feedback | Leonid Logvinov | 2017-05-25 | 2 | -4/+5 |
| | |||||
* | Type the ethereumjs-util | Leonid Logvinov | 2017-05-25 | 2 | -4/+12 |
| | |||||
* | Add isSignatureValid method and tests for it | Leonid Logvinov | 2017-05-25 | 2 | -3/+30 |
| | |||||
* | Add command to generate docs from ts code | Leonid Logvinov | 2017-05-24 | 1 | -0/+1 |
| | |||||
* | Add tslint command to npm scripts and fix linting errors | Leonid Logvinov | 2017-05-24 | 1 | -1/+1 |
| | |||||
* | Create ts folder | Fabio Berger | 2017-05-24 | 1 | -0/+0 |
| | |||||
* | Add empty zeroEx class | Leonid Logvinov | 2017-05-24 | 1 | -0/+5 |