aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove top level .npmignoreFabio Berger2018-02-101-6/+0
| | |
| * | Add npmignore to web3-wrapper and update CHANGELOGFabio Berger2018-02-102-1/+6
| | |
| * | Add npmignore and remove .gitignoreFabio Berger2018-02-103-199/+1
| | |
| * | Add npmignore to utils and update CHANGELOGFabio Berger2018-02-102-0/+7
| | |
| * | Add npmignore to types and update CHANGELOGFabio Berger2018-02-102-0/+7
| | |
| * | cleanup npmignorexFabio Berger2018-02-101-2/+2
| | |
| * | Add npmignore to subproviders and update CHANGELOGFabio Berger2018-02-102-0/+8
| | |
| * | Add npmignore to json-schemas and update CHANGELOGFabio Berger2018-02-102-0/+9
| | |
| * | Add npmignore to dev-utils and update CHANGELOGFabio Berger2018-02-102-0/+7
| | |
| * | Add npmignore to deployer along with a changelogFabio Berger2018-02-102-0/+9
| | |
| * | Add tslint.json to deployer package and fix all tslint issuesFabio Berger2018-02-107-2/+17
| | |
| * | Add npmignore to subpackage and update CHANGELOGFabio Berger2018-02-102-0/+9
| | |
| * | Add npmignore to typings packagesFabio Berger2018-02-102-0/+2
| | |
| * | Add npmignore to subpackage and update CHANGELOGFabio Berger2018-02-102-1/+9
| | |
| * | Add npmignore to abi-gen and update CHANGELOGFabio Berger2018-02-102-5/+12
| | |
| * | Add correct npmignore to 0x.js and update CHANGELOGFabio Berger2018-02-102-0/+14
| | |
| * | Fix issue where custom TSLint rules were not being published to NPMFabio Berger2018-02-103-6/+9
| | |
* | | Merge pull request #388 from 0xProject/fix/testnet-faucet/base-unit-ordersBrandon Millman2018-02-101-8/+8
|\ \ \ | | | | | | | | Convert to baseUnits in signed order
| * | | address is not optional in this contextJacob Evans2018-02-101-2/+2
| | | |
| * | | Convert to baseUnits in signed orderJacob Evans2018-02-101-8/+8
|/ / /
* | | Merge pull request #387 from 0xProject/fix/testnet-faucet/ecsignatureBrandon Millman2018-02-101-1/+1
|\ \ \ | | | | | | | | Testnet Faucet Order conforming to JSON Schema
| * | | signature -> ecSignatureJacob Evans2018-02-101-1/+1
|/ / /
* | | Merge pull request #382 from 0xProject/feature/clean-post-publish-scriptsBrandon Millman2018-02-1017-194/+26
|\ \ \ | |_|/ |/| | Simplify standard postpublish script and remove them from some privat…
| * | Fix missing references to 'this'Brandon Millman2018-02-091-4/+4
| | |
| * | Simplify standard postpublish script and remove them from some private packagesBrandon Millman2018-02-0917-194/+26
| | |
* | | Merge pull request #379 from 0xProject/portal_jsonLeonid2018-02-0919-291/+189
|\ \ \ | |_|/ |/| | Make portal order JSON compatible with 0x.js
| * | Implement blockchain.portalOrderToZeroExOrderLeonid Logvinov2018-02-092-30/+22
| | |
| * | Make naming of schemas consistentLeonid Logvinov2018-02-096-12/+12
| | |
| * | Address feedbackLeonid Logvinov2018-02-0815-157/+57
| | |
| * | Remove hash from signatureDataLeonid Logvinov2018-02-0811-53/+37
| | |
| * | Remove networkId from orderJSONLeonid Logvinov2018-02-087-20/+3
| | |
| * | Split Order into signedOrder and metadataLeonid Logvinov2018-02-087-129/+164
| | |
| * | Reuse ECSignatureLeonid Logvinov2018-02-071-4/+2
| | |
| * | Remove unused types and take their namesLeonid Logvinov2018-02-077-51/+18
| | |
| * | Introduce makerToken and takerToken fields for unsigned token metadataLeonid Logvinov2018-02-077-72/+68
| | |
| * | Move .taker.amount to .takerTokenAmount and .maker.amount to .makerTokenAmountLeonid Logvinov2018-02-075-17/+21
| | |
| * | Move .taker.feeAmount to .takerFee and .maker.feeAmount to .makerFeeLeonid Logvinov2018-02-075-12/+23
| | |
| * | Rename signature to ecSignatureLeonid Logvinov2018-02-074-10/+10
| | |
| * | Rename exchangeContract to exchangeContractAddressLeonid Logvinov2018-02-074-9/+9
| | |
| * | Rename expiration to expirationUnixTimestampSecLeonid Logvinov2018-02-078-23/+51
| | |
* | | Merge pull request #383 from 0xProject/fix/website/addMoreRelayersLandingFabio Berger2018-02-0917-71/+124
|\ \ \ | | | | | | | | Add relayers section to landing page
| * | | Fix linksFabio Berger2018-02-092-6/+12
| | | |
| * | | Center header above relayersFabio Berger2018-02-091-8/+8
| | | |
| * | | Add blog to topBar and as a consequence support external links in topBar ↵Fabio Berger2018-02-092-3/+25
| | | | | | | | | | | | | | | | menu items
| * | | Add title above "benefits" sectionFabio Berger2018-02-091-1/+11
| | | |
| * | | Add Relayer section to landingFabio Berger2018-02-0915-66/+81
| | |/ | |/|
* / | Add new entries to the PR template checklistBrandon Millman2018-02-091-0/+4
|/ /
* | Merge pull request #377 from 0xProject/feature/signed_unsigned_order_contractsLeonid2018-02-099-590/+525
|\ \ | | | | | | Use SignedOrder and Order types from 0x.js
| * | Fix namingsLeonid Logvinov2018-02-091-84/+90
| | |
| * | Use Order and SignedOrder type from 0x.jsLeonid Logvinov2018-02-0710-496/+375
| | |
| * | Introduce SignedOrder class and remove type assertionsLeonid Logvinov2018-02-079-324/+365
| | |
| * | Make orderHashHex a getter instead of a propertyLeonid Logvinov2018-02-075-32/+41
| |/
* | Fix flash message when receiving test etherFabio Berger2018-02-081-1/+2
| |
* | Fix incorrect network idsBrandon Millman2018-02-081-2/+2
| |
* | Update @0xproject/utils version in top level package.jsonBrandon Millman2018-02-081-1/+1
| |
* | Publishcontracts@2.1.10@0xproject/website@0.0.13@0xproject/testnet-faucets@1.0.11@0xproject/deployer@0.0.7Brandon Millman2018-02-0814-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.32.1 - @0xproject/abi-gen@0.2.0 - @0xproject/assert@0.0.17 - @0xproject/connect@0.5.6 - contracts@2.1.10 - @0xproject/deployer@0.0.7 - @0xproject/dev-utils@0.0.11 - @0xproject/json-schemas@0.7.9 - @0xproject/subproviders@0.4.0 - @0xproject/testnet-faucets@1.0.11 - @0xproject/types@0.2.0 - @0xproject/utils@0.3.1 - @0xproject/web3-wrapper@0.1.11 - @0xproject/website@0.0.13
* | Update CHANGELOGsBrandon Millman2018-02-085-5/+15
| |
* | Fix wiki stylingFabio Berger2018-02-081-14/+27
| |
* | Merge pull request #374 from 0xProject/feature/website/addOtherTestnetFaucetsFabio Berger2018-02-084-17/+57
|\ \ | | | | | | Feature/website/add other testnet faucets
| * | Only show faucet error if not on a testnetFabio Berger2018-02-071-4/+3
| | |
| * | Move isTestNetwork into utils and also check it from showing ZRX request buttonFabio Berger2018-02-072-9/+13
| | |
| * | Remove stray logFabio Berger2018-02-071-1/+0
| | |
| * | Use isTestNetwork instead of isKovanTestNetwork on balances page except for ↵Fabio Berger2018-02-071-7/+15
| | | | | | | | | | | | Dharma integration
| * | Properly detect Rinkeby and Ropsten TokenRegistry tokens as mintableFabio Berger2018-02-072-3/+31
| | |
| * | Add networkId to faucet requests so that we can request tokens on Kovan, ↵Fabio Berger2018-02-072-2/+4
| | | | | | | | | | | | Rinkeby and Ropsten
* | | Merge pull request #375 from 0xProject/feature/testnet-faucets/queue-by-networkBrandon Millman2018-02-087-169/+150
|\ \ \ | | | | | | | | Organize async task queues by network
| * | | PrettierBrandon Millman2018-02-081-1/+5
| | | |
| * | | Addressed review commentsBrandon Millman2018-02-084-44/+31
| | | |
| * | | Merge branch 'development' into feature/testnet-faucets/queue-by-networkBrandon Millman2018-02-0884-392/+588
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (24 commits) Fix Remco's github name in CODEOWNERS Fix ABI error message Stop using definite assignment assertion cause prettier doesn't handle that Special-case ZRXToken snake case conversion Fix linter errors Generate contract wrappers on pre-build Add missing async Remove noImplicitThis Tslint disable no-consecutive-blank-lines in generated files Change compiled sources in contracts Change utils Change tests Add base_contract.ts Remove generated files .gitignore gemerated files Change the list of generated wrappers Change contract templates Add indices for index parameters so that their names don't collide Use abi-gen for events in 0x.js Fix artifacts path ...
| * | | | Organize async task queues by networkBrandon Millman2018-02-077-171/+172
| | | | |
* | | | | Update Subprovider READMEJacob Evans2018-02-081-2/+2
| |/ / / |/| | |
* | | | Fix Remco's github name in CODEOWNERSLeonid2018-02-071-1/+1
| |_|/ |/| |
* | | Merge pull request #368 from 0xProject/feature/abigen/addNetworkIdLeonid2018-02-0780-389/+568
|\ \ \ | |_|/ |/| | Add CLI option for networkId, add abi-gen to contracts package
| * | Fix ABI error messageLeonid Logvinov2018-02-072-2/+3
| | |
| * | Stop using definite assignment assertion cause prettier doesn't handle thatLeonid Logvinov2018-02-071-1/+2
| | |
| * | Special-case ZRXToken snake case conversionLeonid Logvinov2018-02-073-3/+6
| | |
| * | Fix linter errorsLeonid Logvinov2018-02-072-2/+3
| | |
| * | Generate contract wrappers on pre-buildLeonid Logvinov2018-02-071-1/+1
| | |
| * | Add missing asyncLeonid Logvinov2018-02-071-1/+1
| | |
| * | Remove noImplicitThisLeonid Logvinov2018-02-071-0/+1
| | |
| * | Tslint disable no-consecutive-blank-lines in generated filesLeonid Logvinov2018-02-071-1/+1
| | |
| * | Change compiled sources in contractsLeonid Logvinov2018-02-071-2/+2
| | |
| * | Change utilsLeonid Logvinov2018-02-074-32/+41
| | |
| * | Change testsLeonid Logvinov2018-02-0710-207/+275
| | |
| * | Add base_contract.tsLeonid Logvinov2018-02-071-0/+35
| | |
| * | Remove generated filesLeonid Logvinov2018-02-075-2208/+0
| | |
| * | .gitignore gemerated filesLeonid Logvinov2018-02-071-0/+8
| | |
| * | Change the list of generated wrappersLeonid Logvinov2018-02-071-1/+1
| | |
| * | Change contract templatesLeonid Logvinov2018-02-074-43/+28
| | |
| * | Add indices for index parameters so that their names don't collideLeonid Logvinov2018-02-071-2/+2
| | |
| * | Use abi-gen for events in 0x.jsLeonid Logvinov2018-02-079-125/+76
| | |
| * | Fix artifacts pathAmir Bandeali2018-02-074-13/+13
| | |
| * | Update compile command and run prettierAmir Bandeali2018-02-072-5/+4
| | |
| * | Add CLI option for networkId, add abi-gen to contracts packageAmir Bandeali2018-02-0756-3/+2328
|/ /
* | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2018-02-0714-85/+196
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x.js: Bump subproviders version Update yarn.lock Change rpcUrls keys back into string literals Add types-bn package to 0x.js and testnet-faucets Prettier Addressed comments and update 0xProject/types-ethereumjs-util deps Prettier Update testnet-faucets README Fix lint errors Add order signing and dispensing ability to faucet
| * Merge pull request #352 from 0xProject/feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0714-94/+196
| |\ | | | | | | Add order signing and dispensing ability to faucet
| | * Bump subproviders versionBrandon Millman2018-02-071-1/+1
| | |
| | * Update yarn.lockBrandon Millman2018-02-071-9/+0
| | |
| | * Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0728-33/+360
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Attribute the origins of NonceTracker Move BlockParamLiteral to shared types package Fixes Move BlockParam and BlockParamLiteral to shared types Rename called to something more readable Newline prettier/lint Yarn.lock Refactor tests for reuse of the fixture subprovider Remove re-fetch of transaction count on error Disable linter for multiple class declarations Remove double declaration Enable CIRCLECI and declare web3 Test faucets to use new NonceTracker Update changelog Readability and prettier Prettify Nonce tracker subprovider Caches the nonce when a request to getTransactionCount is made and increments the pending nonce after successful transactions
| | * | Change rpcUrls keys back into string literalsBrandon Millman2018-02-071-4/+4
| | | |
| | * | Add types-bn package to 0x.js and testnet-faucetsBrandon Millman2018-02-072-0/+2
| | | |
| | * | PrettierBrandon Millman2018-02-072-2/+3
| | | |
| | * | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0728-163/+92
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Update utils in top level package to 0.3.0 Add 0.2.0 back to yarn lock Reword comment on any Link to the wiki article in the README Justify the any usage Publish Revert "Temp" Changelog Change the InjectedWeb3Subprovider to accept Web3.Provider
| | * | | Addressed comments and update 0xProject/types-ethereumjs-util depsBrandon Millman2018-02-0613-115/+85
| | | | |
| | * | | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-06117-6934/+6112
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (37 commits) Add dates to CHANGELOGs Change CHANGELOGs Add .editorconfig Fix a typo Temp Use forEach instead of map Add PR number Fix an exception when a signature collision happens Fix prettier Add regression tests Improve the comment and fix an exception Add missing comas Lerna-ignore tslint and tsconfig Update contract versions, fix tests Rename directories Rename previous contracts, fix imports, add nested file structure Move all contracts into a single directory Update import Fix import Get rid of suffixed contract versioning and replace it with a poor-mans package manager. Versions are stored locally, and are generated in a copy-on-write basis as required ...
| | * | | | PrettierBrandon Millman2018-02-011-1/+1
| | | | | |
| | * | | | Update testnet-faucets READMEBrandon Millman2018-02-011-3/+11
| | | | | |
| | * | | | Merge branch 'development' into feature/testnet-faucets/order-dispenserBrandon Millman2018-02-0177-720/+1306
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (49 commits) Prettier Updated contract generation in 0x to new abi-gen CLI Add PR number to changelog Fix lint errors Removed deprecated CLI options Add protected keyword to underscore lint rule Remove unused prop Fix prettier Uppercase Networks enum values Make default gasPrice more readable Fix prettier mess Fix linter errors Shrink img Fix all setState calls after unmounted errors. Decided to create our own flag rather then using a cancellablePromise since there was little to be gained from this alternative Fix bug where we were return undefined instead of the empty object Default the derivation path to that found in the Ledger subprovider Add browser data to dialog info Add Rinkeby support Pass in whether we want the personal message prefix appended and never append it for Ledger. This fixes signing when Ledger is used and the backing node is not Parity Wholesale replace the tokenByAddress and de-dup properly ...
| | * | | | | Fix lint errorsBrandon Millman2018-01-311-0/+2
| | | | | | |
| | * | | | | Add order signing and dispensing ability to faucetBrandon Millman2018-01-319-39/+167
| | | | | | |
* | | | | | | Add networkId to event labelFabio Berger2018-02-074-7/+19
| | | | | | |
* | | | | | | Update yarn.lockFabio Berger2018-02-071-9/+16
|/ / / / / /
* | | | | | Merge pull request #370 from 0xProject/feature/ga-portal-loggingTom Schmidt2018-02-077-64/+113
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add GA Logging to Portal
| * | | | | Added logging for order filling and order cancellingThomas Schmidt2018-02-072-1/+26
| | | | | |
| * | | | | Moved to async awaitThomas Schmidt2018-02-061-18/+13
| | | | | |
| * | | | | Formatting and removed old GA codeThomas Schmidt2018-02-062-80/+77
| | | | | |
| * | | | | Converted BigNumber to number for GA loggingThomas Schmidt2018-02-062-3/+3
| | | | | |
| * | | | | GA logging for order creationThomas Schmidt2018-02-062-4/+21
| | | | | |
| * | | | | Switch GA to React GA and add logging for PortalThomas Schmidt2018-02-065-7/+22
| | | | | |
* | | | | | Merge pull request #355 from 0xProject/feature/subproviders/nonce-trackerJacob Evans2018-02-0728-33/+360
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Nonce tracker subprovider
| * | | | | Attribute the origins of NonceTrackerJacob Evans2018-02-072-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | NonceTrackerSubprovider is inspired from Web3ProviderEngine NonceTracker
| * | | | | Move BlockParamLiteral to shared types packageJacob Evans2018-02-0712-21/+28
| | | | | | | | | | | | | | | | | | | | | | | | Also BlockParam
| * | | | | FixesJacob Evans2018-02-072-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename to isFirstGetTransactionCount assign nextPrefixedHexNonce as a const
| * | | | | Move BlockParam and BlockParamLiteral to shared typesJacob Evans2018-02-077-21/+19
| | | | | |
| * | | | | Merge branch 'development' into feature/subproviders/nonce-trackerJacob Evans2018-02-064-7/+11
| |\ \ \ \ \
| * | | | | | Rename called to something more readableJacob Evans2018-02-061-5/+6
| | | | | | |
| * | | | | | Newline prettier/lintJacob Evans2018-02-061-1/+1
| | | | | | |
| * | | | | | Yarn.lockJacob Evans2018-02-061-0/+9
| | | | | | |
| * | | | | | Merge branch 'development' into feature/subproviders/nonce-trackerJacob Evans2018-02-06109-6906/+5980
| |\ \ \ \ \ \
| * | | | | | | Refactor tests for reuse of the fixture subproviderJacob Evans2018-02-063-107/+61
| | | | | | | |
| * | | | | | | Remove re-fetch of transaction count on errorJacob Evans2018-02-065-33/+41
| | | | | | | |
| * | | | | | | Disable linter for multiple class declarationsJacob Evans2018-02-031-0/+2
| | | | | | | |
| * | | | | | | Remove double declarationJacob Evans2018-02-021-5/+5
| | | | | | | |
| * | | | | | | Enable CIRCLECI and declare web3Jacob Evans2018-02-023-0/+14
| | | | | | | |
| * | | | | | | Test faucets to use new NonceTrackerJacob Evans2018-02-022-2/+3
| | | | | | | |
| * | | | | | | Update changelogJacob Evans2018-02-021-1/+5
| | | | | | | |
| * | | | | | | Readability and prettierJacob Evans2018-02-022-13/+11
| | | | | | | |
| * | | | | | | PrettifyJacob Evans2018-02-023-68/+65
| | | | | | | |
| * | | | | | | Nonce tracker subproviderJacob Evans2018-02-024-0/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caches the nonce when a request to getTransactionCount is made and increments the pending nonce after successful transactions
* | | | | | | | Update utils in top level package to 0.3.0Jacob Evans2018-02-062-10/+1
| | | | | | | |
* | | | | | | | Add 0.2.0 back to yarn lockJacob Evans2018-02-061-0/+9
| |_|/ / / / / |/| | | | | |
* | | | | | | Reword comment on anyJacob Evans2018-02-061-1/+2
| | | | | | |
* | | | | | | Merge pull request #363 from ↵Jacob Evans2018-02-064-7/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | 0xProject/refactor/subproviders/injected-provider-constructor Change the InjectedWeb3Subprovider to accept Web3.Provider
| * | | | | | Link to the wiki article in the READMEJacob Evans2018-02-061-0/+2
| | | | | | |
| * | | | | | Justify the any usageJacob Evans2018-02-061-1/+2
| | | | | | |
| * | | | | | ChangelogJacob Evans2018-02-031-1/+5
| | | | | | |
| * | | | | | Change the InjectedWeb3Subprovider to accept Web3.ProviderJacob Evans2018-02-032-6/+5
| | | | | | |
* | | | | | | Publishcontracts@2.1.9@0xproject/website@0.0.12@0xproject/testnet-faucets@1.0.10@0xproject/monorepo-scripts@0.1.9@0xproject/deployer@0.0.6Leonid Logvinov2018-02-0617-77/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.32.0 - @0xproject/abi-gen@0.1.7 - @0xproject/assert@0.0.16 - @0xproject/connect@0.5.5 - contracts@2.1.9 - @0xproject/deployer@0.0.6 - @0xproject/dev-utils@0.0.10 - @0xproject/json-schemas@0.7.8 - @0xproject/monorepo-scripts@0.1.9 - @0xproject/subproviders@0.3.6 - @0xproject/testnet-faucets@1.0.10 - @0xproject/tslint-config@0.4.7 - @0xproject/types@0.1.9 - @0xproject/utils@0.3.0 - web3-typescript-typings@0.9.9 - @0xproject/web3-wrapper@0.1.10 - @0xproject/website@0.0.12
* | | | | | | Revert "Temp"Leonid Logvinov2018-02-066-78/+0
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | This reverts commit 881d32e73324b226bdc97f96fb583edb7a5311c1.
* | | | | | Add dates to CHANGELOGsLeonid Logvinov2018-02-062-2/+2
| | | | | |
* | | | | | Merge branch 'development' of github.com:0xProject/0x.js into developmentLeonid Logvinov2018-02-068-17/+73
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #366 from 0xProject/fix/abi_decoder_colisionLeonid2018-02-063-10/+24
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Fix an exception when a signature collision happens
| | * | | | | Change CHANGELOGsLeonid Logvinov2018-02-062-2/+2
| | | | | | |
| | * | | | | Merge branch 'development' into fix/abi_decoder_colisionLeonid2018-02-065-8/+35
| | |\ \ \ \ \
| | * | | | | | Use forEach instead of mapLeonid Logvinov2018-02-052-4/+8
| | | | | | | |
| | * | | | | | Add PR numberLeonid Logvinov2018-02-051-1/+1
| | | | | | | |
| | * | | | | | Fix an exception when a signature collision happensLeonid Logvinov2018-02-052-5/+18
| | | | | | | |
| * | | | | | | Merge pull request #360 from 0xProject/feature/editorconfigRemco Bloemen2018-02-061-0/+12
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Add .editorconfig
| | * | | | | | Add .editorconfigRemco Bloemen2018-02-061-0/+12
| | |/ / / / /
| * | | | | | Merge pull request #350 from 0xProject/fix/ether_token_addressLeonid2018-02-065-8/+38
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Add zeroEx.etherToken.getContractAddressIfExists
| | * | | | | Fix a typoLeonid Logvinov2018-02-061-1/+1
| | | | | | |
| | * | | | | Fix prettierLeonid Logvinov2018-02-051-1/+0
| | | | | | |
| | * | | | | Merge branch 'development' into fix/ether_token_addressLeonid2018-02-05244-8866/+8273
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add regression testsLeonid Logvinov2018-02-051-0/+12
| | | | | | |
| | * | | | | Improve the comment and fix an exceptionLeonid Logvinov2018-02-051-3/+7
| | | | | | |
| | * | | | | Fix PR templateLeonid Logvinov2018-01-301-4/+6
| | | | | | |
| | * | | | | Update CHANGELOGLeonid Logvinov2018-01-301-0/+4
| | | | | | |
| | * | | | | Fix linter errorsLeonid Logvinov2018-01-302-1/+1
| | | | | | |
| | * | | | | Add zeroEx.etherToken.getContractAddressifExistsLeonid Logvinov2018-01-303-2/+11
| | | | | | |
* | | | | | | TempLeonid Logvinov2018-02-066-0/+78
|/ / / / / /
* | | | | | Merge pull request #358 from 0xProject/feature/build_watchLeonid2018-02-0530-24/+100
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add build:watch command to all TS packages
| * | | | | | Add missing comasLeonid Logvinov2018-02-052-2/+2
| | | | | | |
| * | | | | | Merge branch 'development' into feature/build_watchLeonid2018-02-0593-6894/+5862
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #356 from 0xProject/lerna-ignoreLeonid2018-02-051-0/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Ignore test files and markdown files changes on publish
| * | | | | | Lerna-ignore tslint and tsconfigLeonid Logvinov2018-02-051-1/+1
| | | | | | |
| * | | | | | Lerna ignore scripts and libLeonid Logvinov2018-02-011-1/+1
| | | | | | |
| * | | | | | Ignore test files and markdown files changes on publishLeonid Logvinov2018-02-011-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #329 from 0xProject/feature/contracts/versioningAmir Bandeali2018-02-0369-6788/+5701
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement stop-gap smart contract versioning
| * | | | | | Update contract versions, fix testsAmir Bandeali2018-02-0327-88/+90
| | | | | | |
| * | | | | | Rename directoriesAmir Bandeali2018-02-0364-6432/+5551
| | | | | | |
| * | | | | | Rename previous contracts, fix imports, add nested file structureAmir Bandeali2018-02-0326-34/+35
| | | | | | |
| * | | | | | Move all contracts into a single directoryFabio Berger2018-02-0324-7/+8
| | | | | | |
| * | | | | | Update importFabio Berger2018-02-031-1/+1
| | | | | | |
| * | | | | | Fix importFabio Berger2018-02-031-1/+1
| | | | | | |
| * | | | | | Get rid of suffixed contract versioning and replace it with a poor-mans ↵Fabio Berger2018-02-0326-346/+136
|/ / / / / / | | | | | | | | | | | | | | | | | | package manager. Versions are stored locally, and are generated in a copy-on-write basis as required
* | | | | | Merge pull request #361 from 0xProject/feature/deployer/solc-0.4.19Leonid2018-02-022-0/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add solc 0.4.19
| * | | | | | Add solc 0.4.19Remco Bloemen2018-02-022-0/+23
| | |_|_|/ / | |/| | | |
* / | | | | Add CODEOWNERS file for automatically adding reviewers to PRsBrandon Millman2018-02-021-0/+1
|/ / / / /
* | | | | Publishcontracts@2.1.8@0xproject/website@0.0.11@0xproject/testnet-faucets@1.0.9@0xproject/monorepo-scripts@0.1.8@0xproject/deployer@0.0.5Leonid Logvinov2018-02-0118-107/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.31.1 - @0xproject/abi-gen@0.1.6 - @0xproject/assert@0.0.15 - chai-as-promised-typescript-typings@0.0.8 - @0xproject/connect@0.5.4 - contracts@2.1.8 - @0xproject/deployer@0.0.5 - @0xproject/dev-utils@0.0.9 - @0xproject/json-schemas@0.7.7 - @0xproject/monorepo-scripts@0.1.8 - @0xproject/subproviders@0.3.5 - @0xproject/testnet-faucets@1.0.9 - @0xproject/tslint-config@0.4.6 - @0xproject/types@0.1.8 - @0xproject/utils@0.2.4 - web3-typescript-typings@0.9.8 - @0xproject/web3-wrapper@0.1.9 - @0xproject/website@0.0.11
* | | | | Fix linter errorsLeonid Logvinov2018-02-011-2/+2
| | | | |
* | | | | Update changelogLeonid Logvinov2018-02-011-0/+4
| | | | |
* | | | | Merge pull request #357 from ERCdEX/luke/zrx_order_watch_cacheLeonid2018-02-011-1/+5
|\ \ \ \ \ | | | | | | | | | | | | BUGFIX: don't remove maker/zrx order from cache twice
| * | | | | don't remove maker/zrx order from cache twiceLuke Autry2018-02-011-1/+5
| |/ / / /
* / / / / Add OrderWatcherConfig to the list of public typesLeonid Logvinov2018-02-011-0/+1
|/ / / /
| * | | Merge pull request #359 from 0xProject/feature/ts-2.7Leonid2018-02-0519-24/+24
| |\ \ \ | | | | | | | | | | TS 2.7
| | * | | Fix errors after TS upgradeLeonid Logvinov2018-02-011-4/+4
| | | | |
| | * | | Upgrade TS to the newest versionLeonid Logvinov2018-02-0118-20/+20
| | | | |
| * | | | Add build:watch to README'sLeonid Logvinov2018-02-0211-0/+61
| |/ / /
| * / / Add build:watch command to all TS packagesLeonid Logvinov2018-02-0115-0/+15
|/ / /
* | | Merge pull request #354 from ↵Brandon Millman2018-02-0121-58/+65
|\ \ \ | | | | | | | | | | | | | | | | 0xProject/feature/tslint-config/underscore-protected-members Modify lint rules to enforce underscore for protected members
| * | | PrettierBrandon Millman2018-02-012-2/+5
| | | |
| * | | Merge branch 'development' into ↵Brandon Millman2018-02-019-18/+39
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/tslint-config/underscore-protected-members * development: Updated contract generation in 0x to new abi-gen CLI Removed deprecated CLI options Added PR # to the changelog of abi-gen Added CLI options for explicit specifying location of partials and main template
* | | | Merge pull request #346 from joincivil/feature/abi-gen-partialsLeonid2018-01-319-18/+39
|\ \ \ \ | | | | | | | | | | Added CLI options for explicit specifying location of partials and main template
| * | | | Updated contract generation in 0x to new abi-gen CLIOlaf Tomalka2018-01-317-1/+1
| | | | |
| * | | | Removed deprecated CLI optionsOlaf Tomalka2018-01-311-19/+2
| | | | |
| * | | | Added PR # to the changelog of abi-genOlaf Tomalka2018-01-271-1/+3
| | | | |
| * | | | Added CLI options for explicit specifying location of partials and main templateOlaf Tomalka2018-01-272-14/+50
| | | | |
| | * | | Add PR number to changelogBrandon Millman2018-01-311-1/+1
| | | | |
| | * | | Fix lint errorsBrandon Millman2018-01-3117-55/+54
| | | | |
| | * | | Add protected keyword to underscore lint ruleBrandon Millman2018-01-313-3/+8
| |/ / / |/| | |
* | | | Remove unused propFabio Berger2018-01-311-1/+0
| | | |
* | | | Merge pull request #351 from 0xProject/feature/portal-ledger-supportFabio Berger2018-01-3153-645/+1204
|\ \ \ \ | |_|_|/ |/| | | Portal Ledger Support, Lazy-loading token balances/allowances
| * | | Fix prettierFabio Berger2018-01-311-9/+1
| | | |
| * | | Uppercase Networks enum valuesFabio Berger2018-01-317-22/+22
| | | |
| * | | Make default gasPrice more readableFabio Berger2018-01-311-1/+3
| | | |
| * | | Fix prettier messFabio Berger2018-01-311-6/+3
| | | |
| * | | Fix linter errorsFabio Berger2018-01-3121-72/+20
| | | |
| * | | Shrink imgFabio Berger2018-01-311-0/+0
| | | |
| * | | Merge branch 'development' into feature/portal-ledger-supportFabio Berger2018-01-312-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * development: Prettierignore package.json Enable solidity syntax highlighting
| * | | | Fix all setState calls after unmounted errors. Decided to create our own ↵Fabio Berger2018-01-317-43/+90
| | | | | | | | | | | | | | | | | | | | flag rather then using a cancellablePromise since there was little to be gained from this alternative
| * | | | Fix bug where we were return undefined instead of the empty objectFabio Berger2018-01-311-1/+1
| | | | |
| * | | | Default the derivation path to that found in the Ledger subproviderFabio Berger2018-01-311-1/+4
| | | | |
| * | | | Add browser data to dialog infoFabio Berger2018-01-311-1/+1
| | | | |
| * | | | Add Rinkeby supportFabio Berger2018-01-302-6/+3
| | | | |
| * | | | Pass in whether we want the personal message prefix appended and never ↵Fabio Berger2018-01-302-1/+20
| | | | | | | | | | | | | | | | | | | | append it for Ledger. This fixes signing when Ledger is used and the backing node is not Parity
| * | | | Merge branch 'development' into feature/portal-ledger-supportFabio Berger2018-01-3052-219/+434
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Publish Add PR number Add config file specifically in prettier command and fix files Fix prettier Fix prettier Add shouldAddPersonalMessagePrefix param to signOrderHashAsync instead of trying to infer whether to add it or not from the nodeVersion Publish Move @0xproject/types to dependencies Updated web3-typescript-typings changelog Fixed getTransactionReceipt not returning null Run prettier Update changelog Add Rinkeby addresses to artifacts Fix bad merge on package.json Respond to GH comments and add /info endpoint Change package name to @0xproject/testnet-faucets Implement testnet faucets for any testnet available via infura Rename to testnet-faucets Add to the Pull Request Template Create an ISSUE TEMPLATE
| * | | | Wholesale replace the tokenByAddress and de-dup properlyFabio Berger2018-01-304-26/+31
| | | | |
| * | | | Call destroy ealier so that web3Wrapper stops polling for ↵Fabio Berger2018-01-302-3/+8
| | | | | | | | | | | | | | | | | | | | userAddress/networkId updates before we prep for the batchDispatch
| * | | | Disallow negative amountsFabio Berger2018-01-301-1/+1
| | | | |
| * | | | Remove the ability to clear tokenByAddress. It should simply be updated.Fabio Berger2018-01-304-14/+0
| | | | |
| * | | | Use live backend on developmentFabio Berger2018-01-291-1/+1
| | | | |
| * | | | Fetch default gasPrice from our ethGasStation API mirror and set it for all ↵Fabio Berger2018-01-291-3/+34
| | | | | | | | | | | | | | | | | | | | transactions
| * | | | remove unused typeFabio Berger2018-01-291-10/+0
| | | | |
| * | | | Small improvementsFabio Berger2018-01-291-2/+2
| | | | |
| * | | | Fix bug related to balance/allowance fetching being asyncFabio Berger2018-01-291-0/+14
| | | | |
| * | | | Add missing entries for Ropsten and Rinkeby testnets, added Ropsten to ↵Fabio Berger2018-01-296-23/+32
| | | | | | | | | | | | | | | | | | | | Ledger network dropdown
| * | | | Re-set Ledger config dialog to connect step if dialog is closedFabio Berger2018-01-291-0/+1
| | | | |
| * | | | Add flash message instructing user to confirm tx on LedgerFabio Berger2018-01-291-0/+13
| | | | |
| * | | | Add the stack trace to help with debuggingFabio Berger2018-01-291-1/+1
| | | | |
| * | | | Make it such that users can switch between Ledger accounts without first ↵Fabio Berger2018-01-293-9/+12
| | | | | | | | | | | | | | | | | | | | switching back to an injected provider
| * | | | Use colors module and remove in-lined colorsFabio Berger2018-01-292-7/+10
| | | | |
| * | | | Replace heavy loading animation with simple circular loaderFabio Berger2018-01-295-41/+14
| | | | |
| * | | | Add network name to the select providerFabio Berger2018-01-291-12/+15
| | | | |
| * | | | Fix bug where could not switch to Ledger and backFabio Berger2018-01-296-31/+65
| | | | |
| * | | | Implement just-in-time loading of token balances & allowancesFabio Berger2018-01-2823-295/+384
| | | | |
| * | | | Initial Ledger support implementationFabio Berger2018-01-2824-163/+559
| | | | |
| * | | | Remove unused Ledgerco importFabio Berger2018-01-282-2/+0
| | | | |
| * | | | Add light blue as our accent colorFabio Berger2018-01-281-0/+1
| | | | |
| * | | | Properly detect user signing cancellation on Metamask, Parity signer and LedgerFabio Berger2018-01-286-7/+7
| | | | |
| * | | | Merge branch 'development' into feature/portal-ledger-supportFabio Berger2018-01-25524-15110/+20859
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (437 commits) Publish Update yarn.lock Update the CHANGELOG Fix the bug making it impossible to specify the custom ZRX address Fix fill/cancel order by looking for NoError instead of empty blockchainErr given the BlockchainErrs type refactor Add a comment about a yarn bug Add our mainnet and kovan nodes as backups for Portal requests Fix bug hiding the user info from topBar Add dev-utils package to top level README Prettier newline Prettier Allow Token symbols to be alphanumeric Update CHANGELOG, rebase on development Should not -> cannot Reject negative amounts in isValidBaseUnitAmount Re-add changelog for 0x.js Fix prettier Update yarn.lock Move tests to a separate folder Change file layout ... # Conflicts: # packages/website/README.md