aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* Fix typos, run prettier, and allow anyone to call on DummyERC721TokenAmir Bandeali2018-08-178-16/+17
* Update CHANGELOGsAmir Bandeali2018-08-172-0/+13
* Fix Geth testsAmir Bandeali2018-08-171-9/+9
* Fix linting errorsAmir Bandeali2018-08-178-11/+10
* Fix tests that assumed logs were being filteredAmir Bandeali2018-08-174-4/+11
* Add tests for ERC721TokenAmir Bandeali2018-08-174-2/+281
* Add ERC721Receiver that returns incorrect valueAmir Bandeali2018-08-173-1/+68
* Add ERC721 revert reasons to typesAmir Bandeali2018-08-171-0/+5
* Store methodId and number of indexed args in AbiDecoder to differentiate betw...Amir Bandeali2018-08-171-5/+9
* Increase max mintable amountAmir Bandeali2018-08-173-16/+16
* Fix DummyERC721ReceiverAmir Bandeali2018-08-173-141/+57
* Update artifactsAmir Bandeali2018-08-179-98/+3263
* Add tests for ERC20 token with no return valuesAmir Bandeali2018-08-176-5/+261
* Add constructor back to DummyERC721TokenAmir Bandeali2018-08-172-0/+14
* Restructure directoriesAmir Bandeali2018-08-176-52/+103
* Update checking for erc721 existenceAmir Bandeali2018-08-171-3/+2
* Update ERC20TokenAmir Bandeali2018-08-176-47/+113
* Optimize ERC721TokenAmir Bandeali2018-08-175-510/+462
* Merge branch 'development' into sol-compile-lotF. Eugene Aumson2018-08-1749-214/+648
|\
| * Merge pull request #928 from 0xProject/dependabot/npm_and_yarn/copyfiles-2.0.0Fabio Berger2018-08-1728-28/+28
| |\
| | * Bump copyfiles from 1.2.0 to 2.0.0dependabot[bot]2018-08-1528-28/+28
| * | Rename OrderAlreadyCancelledOrFilled -> OrderCancelled.Jacob Evans2018-08-165-37/+40
| * | [Order-utils] Order is valid when maker amount is very smallJacob Evans2018-08-158-31/+195
| * | Merge branch 'development' into refactor/order-utils/market-utils-apiBrandon Millman2018-08-151-1/+1
| |\|
| | * Merge pull request #920 from 0xProject/dependabot/npm_and_yarn/@types/fetch-m...Fabio Berger2018-08-151-1/+1
| | |\
| | | * Bump @types/fetch-mock from 5.12.2 to 6.0.3dependabot[bot]2018-08-141-1/+1
| * | | Merge branch 'development' into refactor/order-utils/market-utils-apiBrandon Millman2018-08-1538-37/+275
| |\| |
| | * | Merge pull request #953 from 0xProject/feature/order-utils/order-sorting-utilsBrandon Millman2018-08-156-0/+230
| | |\ \
| | | * | Update sortingUtils to support Order and SignedOrderBrandon Millman2018-08-141-44/+26
| | | * | Change rateUtils to use OrderBrandon Millman2018-08-141-20/+20
| | | * | Updated CHANGELOGBrandon Millman2018-08-101-0/+4
| | | * | Fix lint errorsBrandon Millman2018-08-104-11/+6
| | | * | Update tests for optional feeRateBrandon Millman2018-08-102-3/+14
| | | * | Make feeRate optional with a default of 0Brandon Millman2018-08-103-10/+13
| | | * | Add tests for sortingUtilsBrandon Millman2018-08-102-1/+66
| | | * | Implement sorting utilsBrandon Millman2018-08-102-0/+70
| | | * | Add tests for rateUtilsBrandon Millman2018-08-101-0/+55
| | | * | Implement rate utilsBrandon Millman2018-08-102-0/+45
| | * | | Merge pull request #966 from 0xProject/feature/typescript-3.0.1Alex Browne2018-08-1530-30/+30
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | feat: Upgrade TypeScript to 3.0.1Alex Browne2018-08-1530-30/+30
| * | | | Make marketUtils interface compatible with Order and SignedOrderBrandon Millman2018-08-142-42/+42
| * | | | Update CHANGELOGBrandon Millman2018-08-141-0/+5
| * | | | Remove remaining amounts that are now defaults in testsBrandon Millman2018-08-141-36/+1
| * | | | Update marketUtils apiBrandon Millman2018-08-143-63/+125
| | |/ / | |/| |
* | | | move doesFileExist to fsWrapperF. Eugene Aumson2018-08-172-13/+13
* | | | change some *Sync to *AsyncF. Eugene Aumson2018-08-172-4/+19
* | | | clarify variable names for artifact mod timesF. Eugene Aumson2018-08-171-6/+6
* | | | flatten out interface to verifyAndPersist* methodF. Eugene Aumson2018-08-171-6/+6
* | | | clarify iteration rangeF. Eugene Aumson2018-08-171-1/+2
* | | | scrap comments in favor of self-documentationF. Eugene Aumson2018-08-171-3/+2
* | | | declare contractData before adding to mapF. Eugene Aumson2018-08-171-2/+3
* | | | change `return Promise<void>` to `await...`F. Eugene Aumson2018-08-171-1/+1
* | | | consolidate binPaths... ref's into fullSolcVersionF. Eugene Aumson2018-08-171-2/+2
* | | | extract method _shouldCompile()F. Eugene Aumson2018-08-161-13/+12
* | | | clarify recompilation testsF. Eugene Aumson2018-08-161-6/+8
* | | | change .rejectedWith(error) to .rejected()F. Eugene Aumson2018-08-161-1/+1
* | | | follow chai_setup patternF. Eugene Aumson2018-08-163-2/+16
* | | | renamed variable `compiled` to `compilerOutput`F. Eugene Aumson2018-08-161-6/+6
* | | | use `for...of _.keys` instead of `for...in`F. Eugene Aumson2018-08-161-5/+1
* | | | raise error for unknown compiler versionF. Eugene Aumson2018-08-161-0/+3
* | | | commentsF. Eugene Aumson2018-08-161-0/+3
* | | | remedy missing *IfExists identifier suffixF. Eugene Aumson2018-08-161-6/+3
* | | | extract interfaces for re-used complex data typesF. Eugene Aumson2018-08-161-23/+28
* | | | move getSolcAsync to static private methodF. Eugene Aumson2018-08-161-23/+23
* | | | rename variable inputsByVersion to versionToInputsF. Eugene Aumson2018-08-161-8/+8
* | | | move getSolcAsync to static private methodF. Eugene Aumson2018-08-161-25/+24
* | | | Update changelogF. Eugene Aumson2018-08-151-0/+10
* | | | test compilerF. Eugene Aumson2018-08-154-12/+82
* | | | simplify method interfaceF. Eugene Aumson2018-08-151-8/+12
* | | | simplify method parameterF. Eugene Aumson2018-08-151-6/+4
* | | | corrected whitespace (no functional changes)F. Eugene Aumson2018-08-151-39/+41
* | | | compile contracts in batchesF. Eugene Aumson2018-08-151-31/+70
* | | | extract method _verifyAndPersistCompilationAsync()F. Eugene Aumson2018-08-151-1/+18
* | | | extract method _compile()F. Eugene Aumson2018-08-151-24/+27
* | | | extract function getSolcAsync()F. Eugene Aumson2018-08-151-18/+25
| |/ / |/| |
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-1489-415/+667
|\| |
| * | PublishAlex Browne2018-08-1432-280/+269
| * | Updated CHANGELOGSAlex Browne2018-08-1457-135/+398
* | | Add defaults for networkId and paginationfragosti2018-08-143-3/+6
|/ /
* | fix(0x.js, order-utils): Fix CHANGELOG.json versionsAlex Browne2018-08-142-16/+6
* | Run publish/installation tests in CircleCI (#951)Alex Browne2018-08-142-46/+119
* | Merge pull request #932 from 0xProject/fix-ganache-forkFabio Berger2018-08-144-8/+3
|\ \
| * | Move to depFabio Berger2018-07-311-1/+1
| * | Remove outdated parts of DockerfileFabio Berger2018-07-311-5/+0
| * | Fix github dep to point to branchFabio Berger2018-07-312-2/+2
* | | Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-stringJacob Evans2018-08-1413-140/+225
|\ \ \
| * | | Update version numbers.Jacob Evans2018-08-145-10/+12
| * | | Rename from SignerProviderType.EthSign to SignerType.DefaultJacob Evans2018-08-119-115/+116
| * | | Update Changelogs. Rebased from developmentJacob Evans2018-08-095-11/+35
| * | | Update jsdocJacob Evans2018-08-092-5/+5
| * | | Introduce SignerProviderTypeJacob Evans2018-08-0911-118/+176
* | | | Merge pull request #958 from 0xProject/feature/sra-api/camel-case-everythingFrancesco Agosti2018-08-149-36/+55
|\ \ \ \
| * | | | Ignore api.json in prettierfragosti2018-08-141-1044/+1
| * | | | apply prettierfragosti2018-08-142-4/+1047
| * | | | Enforce camelCase for all parameters and change the way the site is deployed ...fragosti2018-08-119-33/+52
* | | | | fix(sol-compiler, sol-resolver): Bug where sol-resolver tried to read a direc...Alex Browne2018-08-144-1/+7
* | | | | Merge pull request #938 from 0xProject/sol-cov-fixesFabio Berger2018-08-1410-22/+162
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'sol-cov-fixes' of github.com:0xProject/0x-monorepo into sol-cov...Fabio Berger2018-08-1484-136/+1668
| |\ \ \ \
| | * | | | Merge branch 'development' into sol-cov-fixesLeonid Logvinov2018-08-0982-134/+1658
| | |\| | |
| | * | | | Add @return commentsLeonid Logvinov2018-08-091-0/+9
| | * | | | Import marshaller directlyLeonid Logvinov2018-08-091-2/+1
| * | | | | Remove test for unknown prop now that we are allowing additional props fro tx...Fabio Berger2018-08-141-4/+0
| |/ / / /
| * | | | Add commentsLeonid Logvinov2018-08-031-0/+39
| * | | | Add PR numbersLeonid Logvinov2018-08-034-10/+17
| * | | | Add sol-cov CHANGELOGLeonid Logvinov2018-08-031-0/+20
| * | | | Read truffle compiler config from truffle.js and assert that the passed solid...Leonid Logvinov2018-08-031-7/+51
| * | | | Use CallDataRPC in subproviderLeonid Logvinov2018-08-031-7/+8
| * | | | Add a TODO for failed transactionsLeonid Logvinov2018-08-031-0/+1
| * | | | Export RPC data types from web3-wrapperLeonid Logvinov2018-08-032-1/+14
| * | | | Alow additional properties in txData json-schemaLeonid Logvinov2018-08-032-1/+8
| * | | | Export marshaller from web3-wrapperLeonid Logvinov2018-08-032-0/+9
* | | | | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoKAmir Bandeali2018-08-1010-163/+84
|\ \ \ \ \
| * | | | | Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-106-22/+40
| * | | | | Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-106-141/+44
* | | | | | Fix order-watcher json-schemasfragosti2018-08-101-1/+1
* | | | | | Fix linting issuesfragosti2018-08-102-2/+1
* | | | | | fix contract-wrappers json-schemasfragosti2018-08-1015-271/+186
* | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-1057-92/+566
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #949 from 0xProject/fix/update-dependenciesAlex Browne2018-08-1028-43/+43
| |\ \ \ \ \
| | * | | | | fix: Update dependenciesAlex Browne2018-08-1028-43/+43
| | |/ / / /
| * | | | | Update Clays linkedinfragosti2018-08-101-1/+1
| * | | | | Merge https://github.com/0xProject/0x-monorepo into developmentfragosti2018-08-1026-45/+503
| |\| | | |
| | * | | | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTestsAmir Bandeali2018-08-107-34/+120
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
| | | * | | Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-094-16/+46
| | | * | | Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-093-12/+34
| | | * | | Add return values to combinatorial fillOrder testsAmir Bandeali2018-08-092-11/+51
| | * | | | Merge pull request #915 from 0xProject/feature/encode-decode-checksAlex Browne2018-08-0919-11/+383
| | |\ \ \ \
| | | * | | | Update comment about ethers checksummed address behaviorAlex Browne2018-08-091-3/+3
| | | * | | | Add packages/coverage/.gitkeep fileAlex Browne2018-08-091-0/+0
| | | * | | | Update CI config and package.json to run @0xproject/utils tests on CIAlex Browne2018-08-091-1/+5
| | | * | | | Update remaining CHANGELOG.json filesAlex Browne2018-08-094-0/+22
| | | * | | | Update CHANGELOG.json for contract-wrappersAlex Browne2018-08-091-0/+4
| | | * | | | Update ethers typings for TypeScript 2.9.2Alex Browne2018-08-091-2/+2
| | | * | | | Update CHANGELOG.json for base-contractAlex Browne2018-08-091-0/+9
| | | * | | | Move some ethers-related types to typescript-typings/ethersAlex Browne2018-08-093-13/+25
| | | * | | | Apply prettierAlex Browne2018-08-095-25/+36
| | | * | | | Add strictArgumentEncodingCheck to BaseContract and use it in contract templatesAlex Browne2018-08-0911-9/+319
| * | | | | | Add clay to websitefragosti2018-08-102-0/+11
| |/ / / / /
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into d...fragosti2018-08-091-4/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorCommentsAmir Bandeali2018-08-091-4/+9
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | fix comments and styling for MixinSignatureValidatorAmir Bandeali2018-08-091-4/+9
| * | | | | Change amir picturefragosti2018-08-093-1/+1
| |/ / / /
* | | | | Apply prettierfragosti2018-08-101-6/+14
* | | | | Change scripts folder to build_scriptsfragosti2018-08-102-1/+7
* | | | | Force case change in filefragosti2018-08-101-0/+0
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-0936-72/+120
|\| | | |
| * | | | Merge pull request #947 from 0xProject/feature/confirm-before-publishAlex Browne2018-08-092-9/+15
| |\ \ \ \
| | * | | | fix(monorepo-scripts): Fix typo in git tag commandAlex Browne2018-08-091-1/+1
| | * | | | feat(monorepo-scripts): Add confirmation prompt before publishingAlex Browne2018-08-091-8/+14
| * | | | | Merge pull request #945 from 0xProject/fix/typescript-2.9.2Alex Browne2018-08-0931-34/+49
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update TypeScript to version 2.9.2Alex Browne2018-08-0931-34/+49
| | |/ / /
| * | | | Use asm for hashEIP712Message, increment free memory pointer after asm hashin...Amir Bandeali2018-08-092-9/+28
| * | | | Fix comments, styling, and optimize hashOrderAmir Bandeali2018-08-083-25/+33
| |/ / /
* | | | Remove md hints because the static site cannot handle themfragosti2018-08-091-4/+4
* | | | Add section about json-schemas and sra reportfragosti2018-08-091-4/+30
* | | | Fix links in markdownfragosti2018-08-091-8/+8
* | | | Add to changelog and fix OrderBook typofragosti2018-08-095-9/+19
* | | | Correct orderbook typofragosti2018-08-093-7/+7
* | | | Enforce that error code are ints not numberfragosti2018-08-091-2/+2
* | | | Remove tests directory, use swagger api, make json api compliantfragosti2018-08-096-24/+68
* | | | Change remainingFillableAmount to metaDatafragosti2018-08-092-4/+6
* | | | Change some static side configsfragosti2018-08-082-13/+15
* | | | Add POST order endpointfragosti2018-08-085-12/+56
* | | | Add GET fee_recipientsfragosti2018-08-085-0/+39
* | | | Add GET order_configfragosti2018-08-085-0/+43
* | | | token_pairs -> asset_pairsfragosti2018-08-081-4/+4
* | | | Add GET OrderBook endpointfragosti2018-08-083-0/+92
* | | | Add GET order endpoint specfragosti2018-08-083-1/+47
* | | | Add orders endpointfragosti2018-08-084-1/+175
* | | | Minor refactoringfragosti2018-08-084-26/+7
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-08-0871-1570/+2407
|\| | |
| * | | Remove assertion commentsBrandon Millman2018-08-071-4/+0
| * | | Remove 0x test case from hexSchema testBrandon Millman2018-08-061-1/+1
| * | | Update CHANGELOGsBrandon Millman2018-08-062-0/+13
| * | | Add some test cases that stress slippageBufferAmount paramBrandon Millman2018-08-061-6/+15
| * | | Add tests for findFeeOrdersThatCoverFeesForTargetOrdersBrandon Millman2018-08-064-20/+165
| * | | Change orderStates param name to remaingFillableMakerAssetAmountsBrandon Millman2018-08-063-91/+69
| * | | Implement first round of tests for findOrdersThatCoverMakerAssetFillAmountBrandon Millman2018-08-065-12/+222
| * | | Update hex schema to match 0xBrandon Millman2018-08-061-1/+1
| * | | Move helper functions into order-utilsBrandon Millman2018-08-063-100/+111
| * | | Add findFeeOrdersThatCoverFeesForTargetOrders to ForwarderWrapperBrandon Millman2018-08-061-5/+60
| * | | Add findOrdersThatCoverMakerAssetFillAmount static method on ForwarderWrapperBrandon Millman2018-08-061-1/+44
| * | | Move CreateOrderOpts into shared typesBrandon Millman2018-08-063-12/+22
| * | | Update createFactory to accept one createOrderOpts param to encompass all opt...Brandon Millman2018-08-064-41/+59
| * | | PrettierBrandon Millman2018-08-041-1/+0
| * | | Fix CHANGELOGsBrandon Millman2018-08-043-3/+12
| * | | Update orderFactory interfaceBrandon Millman2018-08-044-33/+28
| * | | Rename to calldata utilsBrandon Millman2018-08-033-16/+16
| * | | Add missing PR numbersBrandon Millman2018-08-032-2/+3
| * | | CHANGELOGBrandon Millman2018-08-021-0/+4
| * | | Add testsBrandon Millman2018-08-022-18/+85
| * | | Add createOrder with no signing to orderFactoryBrandon Millman2018-08-023-6/+45
| * | | Create marketBuyOrdersOptimizationsBrandon Millman2018-08-023-8/+63
| * | | Update contract-wrappers CHANGELOG.jsonBrandon Millman2018-08-021-0/+9
| * | | Merge pull request #934 from 0xProject/feature/contract-wrappers/forwaderBrandon Millman2018-08-0211-10/+448
| |\ \ \ | | |/ / | |/| |
| | * | Clarify ethAmount is in weiBrandon Millman2018-07-311-2/+2
| | * | Update forwarder_wrapper_testBrandon Millman2018-07-311-0/+16
| | * | Add more assertionsBrandon Millman2018-07-313-6/+102
| | * | Write initial test for forwarder_wrapperBrandon Millman2018-07-312-16/+73
| | * | Fix spelling error in exchange wrapper testsBrandon Millman2018-07-311-1/+1
| | * | Add getOrdersInfo to exchange_wrapperBrandon Millman2018-07-313-3/+32
| | * | Implement initial forwarder wrapperBrandon Millman2018-07-318-2/+242
| * | | Add the CHANGELOG entry for #909Leonid Logvinov2018-07-311-0/+9
| * | | Merge branch 'development' into ritave/resolver-check-dirsLeonid Logvinov2018-07-31201-6198/+59132
| |\| |
| | * | Add back tags in htmlBrandon Millman2018-07-311-1/+7
| | * | Fix jobs page overflow issueBrandon Millman2018-07-303-4/+6
| | * | Create MetaTags componentBrandon Millman2018-07-306-75/+117
| | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-07-28188-5949/+58670
| | |\ \
| | | * | Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-2723-1269/+780
| | | |/
| | * | Remove unused variablefragosti2018-07-281-1/+0
| | * | Add loading state for initial load and other PR feedbackfragosti2018-07-282-10/+14
| | * | Make a non-jank Spinner component and use itfragosti2018-07-253-2/+83
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-25128-2299/+2793
| | |\ \
| | * | | Center allowance toggles in account pagefragosti2018-07-251-7/+9
| | * | | Increase allowance toggle loading spinner size by 1fragosti2018-07-251-1/+1
| | * | | Add unlocking and locking token copyfragosti2018-07-251-2/+2
| | * | | Hide tooltip after allowance toggle clickfragosti2018-07-251-1/+3
| | * | | Make tooltip appear to the left of the toggle when onboarding in progressfragosti2018-07-256-3/+20
| | * | | Fix tooltip wrapping issue in onboardinfragosti2018-07-252-8/+16
| | * | | Fix wrap button alignment issuefragosti2018-07-257-224/+40
| | * | | WIP for allowance toggle redesign workingfragosti2018-07-214-16/+118
| | * | | Show token name dynamically in tooltipfragosti2018-07-214-13/+19
| | * | | Implement tooltipsfragosti2018-07-212-8/+56
| | * | | Add loading statefragosti2018-07-213-3/+4
| | * | | Have basic lock and check working in waleltfragosti2018-07-204-13/+93
| * | | | Added fix to CHANGELOGOlaf Tomalka2018-07-271-0/+4
| * | | | Fixed the relative resolver not checking if the file can be read in theOlaf Tomalka2018-07-251-1/+1
| | |/ / | |/| |
* | | | Add discharge config and deployfragosti2018-08-083-3/+36
* | | | Add static site buildfragosti2018-08-083-4/+3
* | | | Add markdown sectionfragosti2018-08-083-3/+188
* | | | Refactor using some utility methodsfragosti2018-08-036-109/+135
* | | | Add errors and headersfragosti2018-08-032-0/+50
* | | | Limit error codes with rangesfragosti2018-08-031-2/+2
* | | | Create asset_pairs SRA endpoint (and establish conventions)fragosti2018-08-034-172/+81
* | | | Enforce stronger naming convention for json schema idsfragosti2018-08-0325-107/+107
* | | | All schema tests paddingfragosti2018-08-021-6/+17
* | | | update orders channel subscribe schemafragosti2018-08-022-76/+14
* | | | Update order book schema testfragosti2018-08-021-18/+43
* | | | Add relayerApiOrdersResponseTestfragosti2018-08-021-0/+33
* | | | Add tests for asset pair endpointfragosti2018-08-022-85/+111
* | | | Group all standard relayer api tests togetherfragosti2018-08-011-405/+406
* | | | Add test for relayerApiOrderSchemafragosti2018-08-014-3/+20
* | | | Add paginated collection test casefragosti2018-08-013-5/+33
* | | | Get schema tests running (not crashiing)fragosti2018-08-015-160/+121
* | | | Update schemas exportfragosti2018-07-311-23/+17
* | | | Update json-schemas for SRA v1fragosti2018-07-3117-115/+157
* | | | Add scriptsfragosti2018-07-282-6/+4
* | | | Add to READMEfragosti2018-07-271-1/+23
* | | | Create API development environment and json distributionfragosti2018-07-272-7/+14