aboutsummaryrefslogtreecommitdiffstats
path: root/yarn.lock
Commit message (Expand)AuthorAgeFilesLines
* Add typeorm and begin inserting database recordsAlex Browne2018-12-051-9/+73
* Add tests for etherscan eventsAlex Browne2018-12-051-1/+1
* Remove old code. Create function for getting contract events via etherscanAlex Browne2018-12-051-634/+265
* Rebase pipeline branch off developmentAlex Browne2018-12-051-67/+665
* Merge pull request #1295 from 0xProject/feature/instant/rollbar-envSteve Klebanoff2018-12-041-0/+15
|\
| * Introduce rollbar pluginSteve Klebanoff2018-11-211-0/+15
* | Merge pull request #1364 from 0xProject/feature/instant/allow-env-vars-in-env...Francesco Agosti2018-12-041-1/+9
|\ \
| * | feat: add dotenv to make env dependencies more explicitfragosti2018-12-011-2/+10
| |/
* | Update yarn.lockLeonid Logvinov2018-12-031-21/+314
* | Replace packages/contracts with contracts/coreLeonid Logvinov2018-12-031-246/+48
|/
* feat(instant): add icons to token selectorBrandon Millman2018-11-161-2/+61
* feat: use stable version of bowserfragosti2018-11-161-8/+4
* Merge pull request #1265 from 0xProject/feature/instant/expose-webpack-dev-se...Francesco Agosti2018-11-161-1/+5
|\
| * feat: expose webpack-dev-server content to local networkfragosti2018-11-151-1/+5
* | chore: update yarn lockBrandon Millman2018-11-151-39/+2
|/
* feat: use capital values for enumsfragosti2018-11-151-1/+38
* feat: display the correct provider type and change unlock / install prompt co...fragosti2018-11-141-39/+6
* Merge pull request #1244 from 0xProject/developerSectionNitsFabio B2018-11-141-1/+1
|\
| * update yarn.lockFabio Berger2018-11-121-17/+2
| * merge developmentFabio Berger2018-11-121-23/+134
| |\
| * | Update yarn.lockFabio Berger2018-10-261-45/+1
* | | Updated CHANGELOGSLeonid Logvinov2018-11-141-1/+38
* | | Updated CHANGELOGSLeonid Logvinov2018-11-121-39/+2
* | | fix(website): fix code splittingBrandon Millman2018-11-121-1/+1
| |/ |/|
* | Updated CHANGELOGSJacob Evans2018-11-091-8/+39
* | Merge pull request #1236 from 0xProject/fix/subproviders/lock-ledger-4.24.0Jacob Evans2018-11-091-5/+15
|\ \
| * | fix: Lock Ledger hw-transport to 4.24.0Jacob Evans2018-11-091-5/+15
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-091-39/+2
|\| |
| * | feat(instant): fallback to an empty wallet provider when none is injectedBrandon Millman2018-11-081-39/+2
* | | feat: implement copy-to-clipboardfragosti2018-11-081-0/+6
|/ /
* | feat: break up deploy into deploy-dogfood and deploy-stagingfragosti2018-11-031-10/+47
* | Merge branch 'development' into feature/instant/fixed-orders-in-render-methodBrandon Millman2018-10-301-39/+2
|\ \
| * | yarn.lock changesSteve Klebanoff2018-10-271-2/+39
* | | fix: init BigNumberInput not BigNumber when initializing statefragosti2018-10-271-1/+38
|/ /
* | Merge pull request #1175 from 0xProject/feature/instant/input-fees-roundingFrancesco Agosti2018-10-271-9/+58
|\ \
| * | fix: weird linting error that depends on typesfragosti2018-10-251-1/+38
| * | feat: change to increasing input width by a constant amount per additional ch...fragosti2018-10-251-46/+2
| * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-251-1/+8
| |\|
| * | feat: upgrade to styled-components v4fragosti2018-10-201-8/+57
* | | Update yarn.lockFabio Berger2018-10-261-45/+1
| |/ |/|
* | Revert "commiting addtl changes to yarn.lock from running yarn"Steve Klebanoff2018-10-241-1/+45
* | commiting addtl changes to yarn.lock from running yarnSteve Klebanoff2018-10-241-45/+1
* | feat(instant): Procesing and Success statesSteve Klebanoff2018-10-241-1/+8
|/
* Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-201-7/+106
|\
| * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-201-875/+922
| |\
| | * chore: Fix scroll issue by bumping version and installing from new branchFabio Berger2018-10-191-5/+5
| * | feat: create dogfood url and deployment workflowfragosti2018-10-181-4/+157
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-191-839/+999
|\ \ \ | | |/ | |/|
| * | chore: update yarn.lockFabio Berger2018-10-181-8/+0
| * | update outdated package and tsconfig issueFabio Berger2018-10-181-338/+33
| * | chore: update yarn.lockJacob Evans2018-10-181-490/+937
| * | Merge pull request #1154 from 0xProject/dev-section-redesignKadinsky2018-10-181-2/+2
| |\ \
| | * \ merge dev-section-redesignFabio Berger2018-10-181-11/+27
| | |\ \
| | | * \ merge developmentFabio Berger2018-10-181-11/+27
| | | |\ \
| | * | | | Update react-scroll hash to avoid collision with older, unfixed branchFabio Berger2018-10-181-1/+1
| | |/ / /
| | * | | merge developmentFabio Berger2018-10-161-16/+40
| | |\ \ \
| | * \ \ \ Merge branch 'development' into dev-section-redesignFabio Berger2018-10-111-884/+197
| | |\ \ \ \
| | * \ \ \ \ merge base branchFabio Berger2018-10-051-321/+1823
| | |\ \ \ \ \
| | * | | | | | Use same Link UI component for react-scroll linksFabio Berger2018-10-031-0/+27
| | * | | | | | Update react-scroll to include fix of using `history.replaceState` instead of...Fabio Berger2018-10-011-1/+1
| * | | | | | | Enable linter on generated abi-gen wrappersLeonid Logvinov2018-10-181-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | use redux dev tools from packageSteve Klebanoff2018-10-181-38/+5
| | |_|_|_|/ | |/| | | |
* / | | | | feat: MVP of passing in sraApiUrl, assetData and other settings from render m...fragosti2018-10-191-39/+17
|/ / / / /
* | | | | chore: Update TypeDoc to 0.13.0 (supports TS v3.1)Fabio Berger2018-10-171-6/+10
* | | | | Merge pull request #1143 from 0xProject/fix/monorepo-scripts/changelog-utcJacob Evans2018-10-171-6/+6
|\ \ \ \ \
| * | | | | fix(monorepo-scripts): Format date as UTC not local time.Jacob Evans2018-10-171-7/+7
| | |_|_|/ | |/| | |
* | | | | Add tests for format and use toFixed instead of round for usdfragosti2018-10-171-0/+4
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-171-15/+0
|\| | | |
| * | | | Remove unused copyfiles dependenciesAlex Browne2018-10-161-15/+0
* | | | | Add ts-optchain and use it instead of lodash getfragosti2018-10-161-1/+42
* | | | | feat: add changelog entries for changed packagesfragosti2018-10-161-16/+1
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-161-40/+49
|\| | | |
| * | | | Update yarn.lockFabio Berger2018-10-111-7/+0
| * | | | fix(website): replace Rollbar UMD with regular npm packageFabio Berger2018-10-111-1/+47
| | |_|/ | |/| |
| * | | Merge pull request #1125 from 0xProject/feature/starter-dev-tools-pagesLeonid Logvinov2018-10-111-39/+9
| |\ \ \
| | * | | Add stuffFabio Berger2018-10-101-39/+9
| | * | | Initial project scaffoldingLeonid Logvinov2018-10-101-91/+3
* | | | | feat: model asset meta data and add dynamic assetData statefragosti2018-10-131-0/+15
|/ / / /
* | | | Upgrade to more recent types, fix yarn.lockfragosti2018-10-111-9/+4
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-101-868/+201
|\| | |
| * | | Fix merge conflictsLeonid Logvinov2018-10-091-0/+39
| * | | Fix ethers build issueLeonid Logvinov2018-10-091-43/+8
| * | | Use bundlewatch instead of bundlesizeLeonid Logvinov2018-10-091-4/+70
| * | | Throw and handle errors from Providers.Jacob Evans2018-10-091-61/+3
| * | | Introduce Metamask Subprovider.Jacob Evans2018-10-051-225/+52
| * | | Expose eth_signTypedData functionality for order signingJacob Evans2018-10-051-514/+100
| | |/ | |/|
* | | Fix currupted yarn lock filefragosti2018-10-051-6/+6
* | | Remove deps we probably dont needfragosti2018-10-051-47/+35
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-051-380/+195
|\| |
| * | Upgrade webpackFabio Berger2018-10-041-380/+195
* | | Add some ui componentsfragosti2018-10-041-0/+6
* | | Add redux to 0x instantfragosti2018-10-041-22/+11
* | | Add styled-components with themefragosti2018-10-041-0/+32
|/ /
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-10-031-18/+162
|\ \
| * | Add a command to run bundle size reporterLeonid Logvinov2018-10-021-35/+134
| * | Add missing yarn.lock changesFabio Berger2018-10-021-0/+27
| |/
* | Add dev environmentfragosti2018-10-031-18/+125
* | Clean up package jsonfragosti2018-10-031-42/+1174
* | Have React setup with basic build workingfragosti2018-09-281-40/+371
|/
* Remove yarn postinstall hack (#1098)Alex Browne2018-09-281-2/+2
* Merge pull request #1069 from 0xProject/feature/ts-ethersLeonid Logvinov2018-09-271-4/+23
|\
| * Merge branch 'development' into feature/ts-ethersLeonid Logvinov2018-09-261-34/+38
| |\
| * | Upgrade to TS version of ethersLeonid Logvinov2018-09-191-4/+23
* | | Update everything to Coinbase Wallet instead of Toshifragosti2018-09-261-1/+54
| |/ |/|
* | Update yarn.lockFabio Berger2018-09-261-33/+29
* | Upgrade blockstream to version that supports fetching logs by blockHash, fixi...Fabio Berger2018-09-211-1/+9
|/
* [testnet-faucets] update to v2Jacob Evans2018-09-051-91/+16
* Run linterfragosti2018-09-051-3/+3
* Use order parser utils from order utilsfragosti2018-09-051-35/+75
* Merge https://github.com/0xProject/0x-monorepo into feature/website/update-po...fragosti2018-09-051-34/+36
|\
| * Update yarn.lockFabio Berger2018-09-041-33/+29
| * Update yarn lockBrandon Millman2018-08-311-30/+34
| * Final tweaks for landing pagefragosti2018-08-311-34/+30
| * Update yarn lockBrandon Millman2018-08-311-4/+4
| * Add TypedText component and use it on landing pagefragosti2018-08-311-1/+7
* | Update yarn lockBrandon Millman2018-08-311-25/+4
* | Token registry from old 0x versionBrandon Millman2018-08-311-2/+60
* | Initial changes for v2 portalBrandon Millman2018-08-311-89/+22
|/
* Merge branch 'development' of https://github.com/0xProject/0x-monorepo into w...fragosti2018-08-301-60/+1
|\
| * feat: Add support for TypeScript project references (#991)Alex Browne2018-08-301-60/+1
* | Change VersionDropDown to use material-ui 3fragosti2018-08-291-3/+208
* | Upgrade version of react-shared in websitefragosti2018-08-291-37/+1
* | Upgrade react-copy-to-clipboardfragosti2018-08-291-16/+7
* | Remove react-tap-event-plugin from react-sharedfragosti2018-08-291-10/+4
* | Upgrade material ui in react-docsfragosti2018-08-291-60/+7
* | Update lockfilefragosti2018-08-291-3/+3
* | Update material-ui in react-sharedfragosti2018-08-291-1/+37
* | Upgrade material ui to 0.20.0fragosti2018-08-291-2/+62
* | Bump react-highlight in react-shared once morefragosti2018-08-251-5/+5
* | Upgrade react-shared used by website to one that depends on react 16fragosti2018-08-251-154/+9
* | Upgrade react-highlight to version that depends on React 16fragosti2018-08-251-0/+9
* | Update react and remove tap event plugin [deprecated]fragosti2018-08-251-32/+36
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into w...fragosti2018-08-251-3195/+3458
|\|
| * Merge pull request #997 from 0xProject/feature/forwarder-helper/initBrandon Millman2018-08-241-2/+72
| |\
| | * Remove legacy docs stuffBrandon Millman2018-08-241-5/+56
| | * Merge branch 'development' into feature/forwarder-helper/initBrandon Millman2018-08-241-191/+226
| | |\
| | * | Update yarn lockBrandon Millman2018-08-241-0/+4
| | * | Merge branch 'development' into feature/forwarder-helper/initBrandon Millman2018-08-241-13/+170
| | |\ \
| | * | | Add assertions to factoryBrandon Millman2018-08-231-37/+29
| | * | | Update yarn lockBrandon Millman2018-08-231-1/+16
| | * | | Add ForwarderHelperImplConfigBrandon Millman2018-08-231-0/+4
| | * | | Remove marketSell and add to marketBuy implementationBrandon Millman2018-08-231-3/+3
| | * | | Flesh out typesBrandon Millman2018-08-231-3/+3
* | | | | Add new react and typesfragosti2018-08-251-3382/+3202
|/ / / /
* | | / Update uglify plugin to support es6Brandon Millman2018-08-241-0/+13
| |_|/ |/| |
* | | Merge pull request #924 from 0xProject/wrap-typedocFabio Berger2018-08-241-225/+256
|\ \ \ | |_|/ |/| |
| * | Upgrade Typedoc to 0.12.0, which works with TS 3.xFabio Berger2018-08-231-46/+46
| * | update yarn.lockFabio Berger2018-08-231-3/+7
| * | merge developmentFabio Berger2018-08-231-1/+15
| |\ \
| * | | Replace complicated camelCase to spaces logic with change-case packageFabio Berger2018-08-231-3/+137
| * | | Fix many linter errors that showed up upon upgrading tsutilFabio Berger2018-08-231-24/+14
| * | | Fix remaining merge issuesFabio Berger2018-08-221-37/+29
| * | | Merge development branchFabio Berger2018-08-221-23/+23
| |\ \ \ | | | |/ | | |/|
| * | | Update yarn.lockFabio Berger2018-08-171-3/+2
| * | | Merge developmentFabio Berger2018-08-171-28/+14
| |\ \ \
| * | | | Export Web3ProviderEngine directly instead of indirectly via subprovidersFabio Berger2018-08-161-30/+38
| * | | | Merge in new 0x.js interfaceFabio Berger2018-08-151-3/+3
| |\ \ \ \
| | * | | | Refactor 0x.js to simply re-export it's own sub-dependencies rather then wrap...Fabio Berger2018-08-141-4/+4
| * | | | | Fix additional merge conflictsFabio Berger2018-08-151-11/+93
| * | | | | Merge developmentFabio Berger2018-08-151-38/+782
| |\| | | |
| * | | | | Update yarn.lockFabio Berger2018-08-141-7/+0
| * | | | | Update yarn.lockFabio Berger2018-08-061-144/+13
| * | | | | Use our fork of react-scroll that fixes scrolling within an absolutely positi...Fabio Berger2018-08-021-6/+6
| * | | | | Start refactoring docs to remove unnecessary configs given more concise TypeD...Fabio Berger2018-08-011-3/+9
| * | | | | Update yarn.lockFabio Berger2018-07-301-127/+5
* | | | | | fix: Make non-interactive npm login for publish tests more robustAlex Browne2018-08-231-12/+155
| |_|_|_|/ |/| | | |
* | | | | Pin sra-report to 0xproject/connect v1.0.4fragosti2018-08-211-0/+14
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-211-33/+27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update yarn lockBrandon Millman2018-08-211-2/+2
| * | | | Merge pull request #978 from 0xProject/feature/lenra-3.0.0-beta.25Alex Browne2018-08-171-21/+20
| |\ \ \ \
| | * | | | feat: Update lerna to version 3.0.0-beta.25 of our forkAlex Browne2018-08-171-22/+21
* | | | | | Use uuid as string for requestIdfragosti2018-08-171-4/+10
* | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-171-30/+15
|\| | | | |
| * | | | | Bump copy-webpack-plugin from 4.5.1 to 4.5.2dependabot[bot]2018-08-171-4/+4
| | |_|_|/ | |/| | |
| * | | | Bump copyfiles from 1.2.0 to 2.0.0dependabot[bot]2018-08-151-17/+2
| |/ / /
| * | | Merge pull request #920 from 0xProject/dependabot/npm_and_yarn/@types/fetch-m...Fabio Berger2018-08-151-35/+44
| |\ \ \
| | * | | Bump @types/fetch-mock from 5.12.2 to 6.0.3dependabot[bot]2018-08-141-35/+44
* | | | | Update json-schemas, update HTTPClient typesfragosti2018-08-151-29/+37
|/ / / /
* | | | Merge pull request #966 from 0xProject/feature/typescript-3.0.1Alex Browne2018-08-151-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | feat: Upgrade TypeScript to 3.0.1Alex Browne2018-08-151-3/+3
| | |/ | |/|
* / | Add defaults for networkId and paginationfragosti2018-08-141-4/+4
|/ /
* | Merge pull request #932 from 0xProject/fix-ganache-forkFabio Berger2018-08-141-4/+4
|\ \
| * | Fix github dep to point to branchFabio Berger2018-07-311-4/+4
* | | Enforce camelCase for all parameters and change the way the site is deployed ...fragosti2018-08-111-2/+2
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-101-43/+33
|\ \ \
| * | | fix: Update dependenciesAlex Browne2018-08-101-1/+1
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-091-0/+4
|\| | |
| * | | Update TypeScript to version 2.9.2Alex Browne2018-08-091-67/+4
* | | | Remove tests directory, use swagger api, make json api compliantfragosti2018-08-091-5/+133
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-081-1/+24
|\| | |
| * | | Create MetaTags componentBrandon Millman2018-07-301-1/+16
| | |/ | |/|
| * | Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-271-0/+8
| |/
* | Add discharge config and deployfragosti2018-08-081-11/+144
* | Get schema tests running (not crashiing)fragosti2018-08-011-4/+4
* | Update json-schemas for SRA v1fragosti2018-07-311-3/+3
* | Create API development environment and json distributionfragosti2018-07-271-18/+445
* | Add typescript typings for Open API specfragosti2018-07-271-0/+15
* | Add basic smoke testfragosti2018-07-271-71/+20
|/
* Update yarn.lockFabio Berger2018-07-261-0/+67
* update yarn.lockFabio Berger2018-07-261-7/+0
* Update yarn.lockFabio Berger2018-07-261-0/+7
* Update yarn.lock to not use local npm registryFabio Berger2018-07-251-76/+76
* update yarn.lockFabio Berger2018-07-251-0/+7
* Install our fork of lerna and use itFabio Berger2018-07-251-449/+470
* Fix lerna versonFabio Berger2018-07-241-17/+17
* Fix(lerna): Change lerna versionLeonid Logvinov2018-07-241-16/+16
* Upgrade to new lernaFabio Berger2018-07-241-61/+61
* Temporarily use local lernaFabio Berger2018-07-241-92/+92
* Fix version of ethereumjs-abi to 0.6.5 to fix decoding bugFabio Berger2018-07-221-3/+10
* Merge pull request #904 from lukeautry/luke/leading_zero_encodeFabio Berger2018-07-221-1/+1
|\
| * fix decodeAssetData for addresses starting in 0Luke Autry2018-07-221-1/+1
* | Add AbortController polyfill to fetchAsync in utilsBrandon Millman2018-07-211-0/+4
* | Upgrade some @0xproject packages to 1.0.0 in websiteBrandon Millman2018-07-211-66/+7
|/
* Remove the postinstall hookLeonid Logvinov2018-07-201-33/+241
* Use old assert version in @0xproject/connectLeonid Logvinov2018-07-201-102/+183
* Merge branch 'v2-prototype' into update-lernaFabio Berger2018-07-191-35/+72
|\
| * Update yarn.lockFabio Berger2018-07-181-29/+79
| * MergeLeonid Logvinov2018-07-181-17/+4
| * Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-181-9/+15
| |\
| * \ Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-161-23/+42
| |\ \
| * | | Upgrade tslint to use prefer-readonlyLeonid Logvinov2018-07-131-8/+9
* | | | Update yarn.lockFabio Berger2018-07-191-27/+4
* | | | Replace lerna-get-packages with our own implementationFabio Berger2018-07-191-8/+27
* | | | Update to Lerna v3.0-betaFabio Berger2018-07-181-178/+677
| |_|/ |/| |
* | | Fix tslint issuesLeonid Logvinov2018-07-171-11/+17
* | | Bump npm-run-all from 4.1.2 to 4.1.3dependabot[bot]2018-07-141-5/+6
| |/ |/|
* | Merge pull request #866 from 0xProject/feature/website/integrate-heapFrancesco Agosti2018-07-141-16/+0
|\ \
| * | Replace calls to google analytics with calls to heapfragosti2018-07-121-16/+0
* | | Update yarn.lock and artifactFabio Berger2018-07-131-1/+1
* | | Update depsFabio Berger2018-07-131-1/+36
* | | -fetch';Fabio Berger2018-07-131-1/+1
* | | Add fetchAsync util and RPCSubproviderFabio Berger2018-07-131-4/+4
| |/ |/|
* | Merge pull request #788 from feuGeneA/abi-gen-ignore-unchangedLeonid Logvinov2018-07-121-13/+51
|\ \
| * \ Merge branch 'v2-prototype' into abi-gen-ignore-unchangedLeonid Logvinov2018-07-101-21/+58
| |\ \
| * | | add tests of abi-genF. Eugene Aumson2018-07-091-13/+51
* | | | Implement web browser socketBrandon Millman2018-07-121-3/+4
| |_|/ |/| |
* | | Add sourcemaps for rollbarfragosti2018-07-101-2/+47
| |/ |/|
* | Remaining version fixesFabio Berger2018-07-101-21/+58
|/
* Merge pull request #822 from 0xProject/v2-contract-wrappers-WIPLeonid Logvinov2018-07-061-6/+54
|\
| * Merge branch 'v2-prototype' into v2-contract-wrappers-WIPLeonid Logvinov2018-07-051-10/+0
| |\
| * | Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-051-0/+18
| * | Merge branch 'v2-prototype' into v2-contract-wrappers-WIPLeonid Logvinov2018-07-051-72/+122
| |\ \
| * | | Dump assert version and make the order-watcher depend on the old assert versionLeonid Logvinov2018-06-291-2/+12
| * | | Regenerate yarn.lockLeonid Logvinov2018-06-291-9/+29
* | | | Added Solhint package and 'lint-contracts' npm scriptAlex Shafranovich2018-07-061-8/+236
| |_|/ |/| |
* | | Update json-schema version used by web3-wrapperFabio Berger2018-07-051-11/+1
* | | merge v2-prototypeFabio Berger2018-07-051-80/+130
|\ \ \ | | |/ | |/|
| * | Merge branch 'v2-prototype' into eth-lightwallet-subprovider-finalJacob Evans2018-07-041-63/+31
| |\ \
| | * | Update blockstream to latest version, propogate errors to top-level callersFabio Berger2018-07-041-63/+31
| * | | Merge branch 'v2-prototype' into eth-lightwallet-subprovider-finalJacob Evans2018-07-031-7/+8
| |\| |