Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 7 | -12/+30 |
| | |||||
* | Cleanup coreCombinatorialUtils | Fabio Berger | 2018-06-19 | 1 | -220/+226 |
| | |||||
* | Comments and cleanup | Fabio Berger | 2018-06-19 | 1 | -20/+8 |
| | |||||
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 94 | -492/+1087 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Prettier fix Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility Fix missed merge conflicts Fix additional versions and update yarn.lock Add OrderWatcherConfig type to 0x.js docs page Export OrderWatcherConfig from 0x.js Update all package versions to match latest published to NPM Update CHANGELOG's with publishes performed on development branch Rebase with latest removing PROXY_ID from transfer Split transfer impl and AssetProxyMixin change @0xproject/types to ethereum-types remove mistaken comment workaround for TypeScript trailing comma bug Document contract_templates | ||||
| * | Prettier fix | Fabio Berger | 2018-06-19 | 1 | -3/+5 |
| | | |||||
| * | Merge pull request #701 from feuGeneA/v2-prototype | Fabio Berger | 2018-06-19 | 3 | -5/+16 |
| |\ | | | | | | | Document use of contract_templates (take 2; based on v2-prototype, not master) | ||||
| | * | change @0xproject/types to ethereum-types | F. Eugene Aumson | 2018-06-15 | 1 | -1/+1 |
| | | | |||||
| | * | remove mistaken comment | F. Eugene Aumson | 2018-06-15 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | It must have been left over from when an abi-gen output was modified to be the source of this template. | ||||
| | * | workaround for TypeScript trailing comma bug | F. Eugene Aumson | 2018-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before this change, TypeScript compilation of the generated contract wrapper was giving me the following errors: $ abi-gen --abis 'build/contracts/*.json' --out build/types --template contract_templates/contract.handlebars --partials 'contract_templates/partials/*.handlebars' Found 7 partial templates Found 1 ABI files Processing: Migrations... Created: build/types/migrations.ts $ tsc build/types/migrations.ts(81,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(108,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(130,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(146,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(173,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(195,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. Here is the generated code around the first error: 74: public setCompleted = { 75: async sendTransactionAsync( 76: completed: BigNumber, 77: txData: Partial<TxData> = {}, 78: ): Promise<string> { 79: const self = this as any as MigrationsContract; 80: const inputAbi = self._lookupAbi('setCompleted(uint256)').inputs; 81: [completed, 82: ] = BaseContract._formatABIDataItemList(inputAbi, [completed, 83: ], BaseContract._bigNumberToString.bind(self)); All of the other errors are the same, a destructuring assignment with a single element but with a trailing comma. This is legal JavaScript but it is not allowed by the TypeScript compiler, apparently per the bug described at https://github.com/Microsoft/TypeScript/issues/24628 . While awaiting the 3.0 version of TypeScript, it's a simple enough change to have the template not append a trailing comma. | ||||
| | * | Document contract_templates | F. Eugene Aumson | 2018-06-15 | 1 | -0/+15 |
| | | | |||||
| * | | Merge pull request #728 from 0xProject/fix/post-dev-publish | Fabio Berger | 2018-06-19 | 84 | -356/+856 |
| |\ \ | | | | | | | | | Update v2-prototype w/ development changes since publish | ||||
| | * | | Fix missed merge conflicts | Fabio Berger | 2018-06-19 | 3 | -14/+0 |
| | | | | |||||
| | * | | Fix additional versions and update yarn.lock | Fabio Berger | 2018-06-19 | 8 | -8/+8 |
| | | | | |||||
| | * | | Add OrderWatcherConfig type to 0x.js docs page | Fabio Berger | 2018-06-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | Export OrderWatcherConfig from 0x.js | Fabio Berger | 2018-06-19 | 1 | -0/+2 |
| | | | | |||||
| | * | | Update all package versions to match latest published to NPM | Fabio Berger | 2018-06-19 | 31 | -234/+234 |
| | | | | |||||
| | * | | Update CHANGELOG's with publishes performed on development branch | Fabio Berger | 2018-06-19 | 50 | -111/+622 |
| | | | | |||||
| * | | | Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility | Ara Kevonian | 2018-06-19 | 1 | -2/+7 |
| | | | | |||||
| * | | | Merge pull request #659 from ↵ | Jacob Evans | 2018-06-19 | 6 | -129/+206 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | 0xProject/feature/contracts/split-proxy-internal-logic Split transfer implementation and AssetProxyMixin | ||||
| | * | | Rebase with latest removing PROXY_ID from transfer | Jacob Evans | 2018-06-18 | 5 | -95/+111 |
| | | | | |||||
| | * | | Split transfer impl and AssetProxyMixin | Jacob Evans | 2018-06-18 | 4 | -95/+156 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 73 | -415/+1965 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Increase number of columns in relayer grid for small screens Make isValidSignature public Make batchFill methods return FIllResults struct Remove remove_tags script Small fixes Use semver package instead of getNextPatchVersion Use semver library instead of semverUtils small fixes Show all errors of a given kind at once rather then throwing after the first instance is encountered fix package.json Add more prepublish checks remove remove_tags script Create a shared Image component Adjust version in changelog Update RelayerGridTile render logic to incorportate colors and logos Add max width to top bar Set max-width for LargeLayout Finish last onboarding step Finish set allowance step Add onboarding assets ... | ||||
| * | | | Increase number of columns in relayer grid for small screens | Brandon Millman | 2018-06-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 9 | -53/+331 |
| | | | | |||||
| * | | | Make batchFill methods return FIllResults struct | Amir Bandeali | 2018-06-19 | 2 | -10/+28 |
| | | | | |||||
| * | | | Remove remove_tags script | Fabio Berger | 2018-06-19 | 1 | -57/+0 |
| | | | | |||||
| * | | | Small fixes | Fabio Berger | 2018-06-19 | 3 | -10/+4 |
| | | | | |||||
| * | | | Use semver package instead of getNextPatchVersion | Fabio Berger | 2018-06-19 | 2 | -7/+16 |
| | | | | |||||
| * | | | Use semver library instead of semverUtils | Fabio Berger | 2018-06-19 | 6 | -73/+17 |
| | | | | |||||
| * | | | small fixes | Fabio Berger | 2018-06-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | Show all errors of a given kind at once rather then throwing after the first ↵ | Fabio Berger | 2018-06-19 | 1 | -10/+36 |
| | | | | | | | | | | | | | | | | instance is encountered | ||||
| * | | | fix package.json | Fabio Berger | 2018-06-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add more prepublish checks | Fabio Berger | 2018-06-19 | 8 | -39/+332 |
| | | | | |||||
| * | | | remove remove_tags script | Fabio Berger | 2018-06-19 | 2 | -4/+0 |
| | | | | |||||
| * | | | Merge pull request #712 from 0xProject/feature/website/portal-facelift | Brandon Millman | 2018-06-19 | 6 | -42/+68 |
| |\ \ \ | | | | | | | | | | | Change relayer grid tile to use logos and primary colors | ||||
| | * | | | Create a shared Image component | Brandon Millman | 2018-06-19 | 2 | -35/+48 |
| | | | | | |||||
| | * | | | Update RelayerGridTile render logic to incorportate colors and logos | Brandon Millman | 2018-06-17 | 3 | -14/+24 |
| | | | | | |||||
| | * | | | Add max width to top bar | Brandon Millman | 2018-06-17 | 2 | -1/+3 |
| | | | | | |||||
| | * | | | Set max-width for LargeLayout | Brandon Millman | 2018-06-17 | 1 | -4/+5 |
| | |/ / | |||||
| * | | | Merge pull request #704 from 0xProject/bug/website/fix-filling-order | Francesco Agosti | 2018-06-19 | 8 | -4/+21 |
| |\ \ \ | | | | | | | | | | | Fix filling orders on Portal | ||||
| | * | | | Adjust version in changelog | fragosti | 2018-06-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Prettier | fragosti | 2018-06-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add to changelog for contract-wrappers | fragosti | 2018-06-15 | 1 | -0/+8 |
| | | | | | |||||
| | * | | | Fix typo | fragosti | 2018-06-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix filling orders on Portal | fragosti | 2018-06-15 | 7 | -4/+13 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #711 from ↵ | Francesco Agosti | 2018-06-19 | 25 | -85/+801 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | 0xProject/website/feature/prettier-onboarding-components Made onboarding look like the mocks | ||||
| | * | | Finish last onboarding step | fragosti | 2018-06-16 | 7 | -2/+277 |
| | | | | |||||
| | * | | Finish set allowance step | fragosti | 2018-06-16 | 2 | -5/+32 |
| | | | | |||||
| | * | | Add onboarding assets | fragosti | 2018-06-16 | 7 | -0/+82 |
| | | | | |||||
| | * | | Add all steps to their own file | fragosti | 2018-06-16 | 11 | -71/+196 |
| | | | | |||||
| | * | | Prettify account setup and add eth steps of onboarding | fragosti | 2018-06-16 | 3 | -3/+32 |
| | | | | |||||
| | * | | Make metamask part of the fow pretty | fragosti | 2018-06-16 | 3 | -7/+35 |
| | | | | |||||
| | * | | Make start onboarding button pretty | fragosti | 2018-06-16 | 1 | -2/+17 |
| | | | | |||||
| | * | | Improve styles of onboarding tooltip | fragosti | 2018-06-16 | 7 | -53/+117 |
| | | | | |||||
| | * | | Add Pointer component | fragosti | 2018-06-15 | 2 | -16/+87 |
| | | | | |||||
| * | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugs | Remco Bloemen | 2018-06-16 | 1 | -1/+29 |
| |\ \ \ | | | | | | | | | | | Handle tokens that do not return bool | ||||
| | * | | | Handle tokens that do not return bool | Remco Bloemen | 2018-06-14 | 1 | -1/+29 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #705 from 0xProject/feature/revert-trace-subprovider | Alex Browne | 2018-06-15 | 14 | -103/+365 |
| |\ \ \ | | |_|/ | |/| | | Introduce subprovider for printing revert stack traces | ||||
| | * | | Change wording of error message when you try to use more than one subprovider | Alex Browne | 2018-06-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove redundant check in trace.ts and revert_trace.ts | Alex Browne | 2018-06-15 | 2 | -6/+1 |
| | | | | |||||
| | * | | Fix linter errors | Alex Browne | 2018-06-15 | 1 | -0/+1 |
| | | | | |||||
| | * | | De-duplicate code by refactoring subprovider classes | Alex Browne | 2018-06-15 | 5 | -204/+89 |
| | | | | |||||
| | * | | Fix linter errors and remove coverage.json | Alex Browne | 2018-06-15 | 1 | -2/+1 |
| | | | | |||||
| | * | | Remove unused variables and other small fixes | Alex Browne | 2018-06-15 | 4 | -10/+11 |
| | | | | |||||
| | * | | Reverse order of stack trace to match behavior of most other language stack ↵ | Alex Browne | 2018-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | traces | ||||
| | * | | Fix a bug in revert_trace.ts | Alex Browne | 2018-06-15 | 4 | -40/+55 |
| | | | | |||||
| | * | | Introduce subprovider for printing revert stack traces | Alex Browne | 2018-06-15 | 10 | -50/+416 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-15 | 8 | -23/+132 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Run prettify Implement allowance and final flow step Render TokenAllowance Add utilities for getting tokens from tokensByAddress Wrap AllowanceToggle in redux container | ||||
| * | | | Merge pull request #695 from ↵ | Francesco Agosti | 2018-06-15 | 8 | -23/+132 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | 0xProject/feature/website/onboarding-flow-allowances Implement allowances and final "congrats" onboarding flow step | ||||
| | * | | Run prettify | fragosti | 2018-06-15 | 1 | -7/+8 |
| | | | | |||||
| | * | | Implement allowance and final flow step | fragosti | 2018-06-13 | 6 | -21/+42 |
| | | | | |||||
| | * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-13 | 225 | -1468/+4849 |
| | |\ \ | | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances | ||||
| | * \ \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 308 | -2450/+2786 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances | ||||
| | * | | | | Render TokenAllowance | fragosti | 2018-06-07 | 2 | -5/+20 |
| | | | | | | |||||
| | * | | | | Add utilities for getting tokens from tokensByAddress | fragosti | 2018-06-07 | 4 | -3/+20 |
| | | | | | | |||||
| | * | | | | Wrap AllowanceToggle in redux container | fragosti | 2018-06-07 | 5 | -11/+66 |
| | | | | | | |||||
* | | | | | | Add ability to tweak the relevant balances/allowances for the maker and ↵ | Fabio Berger | 2018-06-15 | 4 | -78/+380 |
| | | | | | | | | | | | | | | | | | | | | | | | | taker for a fillScenario. Convert more of the core tests to the declarative form. | ||||
* | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵ | Fabio Berger | 2018-06-15 | 10 | -84/+341 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens | ||||
* | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert ↵ | Fabio Berger | 2018-06-14 | 5 | -60/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations | ||||
* | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-14 | 29 | -38/+814 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (27 commits) Add back redirector behind feature flag Update minHeight in Text Use Text components in Values Use spread operator instead of React.createElement Fix issue with positions hash Revert localhost config Use Text in Teams Use Text in OpenPositions Use Text component for HeaderItem Remove FloatingImage Move FilledImage into components/ui Replace FlatButton with Button in Retry Fix incorrect colors Add font family to Button component and use in Join0x component Consolidate jobs page grey colors with shared colors Fix lint errors Remove extra packages Implement small open positions Implement large screen open positions Teams section ... | ||||
| * | | | | | Merge pull request #685 from 0xProject/feature/website/jobs-page | Brandon Millman | 2018-06-14 | 29 | -38/+814 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Jobs page | ||||
| | * | | | | Add back redirector behind feature flag | Brandon Millman | 2018-06-14 | 3 | -1/+19 |
| | | | | | | |||||
| | * | | | | Update minHeight in Text | Brandon Millman | 2018-06-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Use Text components in Values | Brandon Millman | 2018-06-14 | 1 | -3/+7 |
| | | | | | | |||||
| | * | | | | Use spread operator instead of React.createElement | Brandon Millman | 2018-06-14 | 3 | -7/+7 |
| | | | | | | |||||
| | * | | | | Fix issue with positions hash | Brandon Millman | 2018-06-13 | 1 | -19/+21 |
| | | | | | | |||||
| | * | | | | Revert localhost config | Brandon Millman | 2018-06-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Use Text in Teams | Brandon Millman | 2018-06-13 | 1 | -3/+7 |
| | | | | | | |||||
| | * | | | | Use Text in OpenPositions | Brandon Millman | 2018-06-13 | 3 | -5/+8 |
| | | | | | | |||||
| | * | | | | Use Text component for HeaderItem | Brandon Millman | 2018-06-13 | 2 | -7/+11 |
| | | | | | | |||||
| | * | | | | Remove FloatingImage | Brandon Millman | 2018-06-13 | 3 | -12/+3 |
| | | | | | | |||||
| | * | | | | Move FilledImage into components/ui | Brandon Millman | 2018-06-13 | 3 | -2/+2 |
| | | | | | | |||||
| | * | | | | Replace FlatButton with Button in Retry | Brandon Millman | 2018-06-13 | 1 | -12/+12 |
| | | | | | | |||||
| | * | | | | Fix incorrect colors | Brandon Millman | 2018-06-13 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add font family to Button component and use in Join0x component | Brandon Millman | 2018-06-13 | 2 | -13/+16 |
| | | | | | | |||||
| | * | | | | Consolidate jobs page grey colors with shared colors | Brandon Millman | 2018-06-13 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fix lint errors | Brandon Millman | 2018-06-13 | 10 | -15/+12 |
| | | | | | | |||||
| | * | | | | Remove extra packages | Brandon Millman | 2018-06-13 | 2 | -2/+0 |
| | | | | | | |||||
| | * | | | | Implement small open positions | Brandon Millman | 2018-06-13 | 8 | -120/+232 |
| | | | | | | |||||
| | * | | | | Implement large screen open positions | Brandon Millman | 2018-06-13 | 9 | -104/+187 |
| | | | | | | |||||
| | * | | | | Teams section | Brandon Millman | 2018-06-13 | 6 | -75/+70 |
| | | | | | | |||||
| | * | | | | Benefits section | Brandon Millman | 2018-06-13 | 3 | -12/+75 |
| | | | | | | |||||
| | * | | | | Refactor into BulletedItemList component | Brandon Millman | 2018-06-13 | 2 | -24/+33 |
| | | | | | | |||||
| | * | | | | Rework values section | Brandon Millman | 2018-06-13 | 2 | -44/+13 |
| | | | | | | |||||
| | * | | | | Polish mission section and photo section | Brandon Millman | 2018-06-13 | 7 | -40/+95 |
| | | | | | | |||||
| | * | | | | Add link to open positions section | Brandon Millman | 2018-06-13 | 3 | -6/+20 |
| | | | | | | |||||
| | * | | | | Add scroll to top for jobs page | Brandon Millman | 2018-06-13 | 1 | -21/+28 |
| | | | | | | |||||
| | * | | | | Skeleton for jobs page and initial implementation | Brandon Millman | 2018-06-13 | 22 | -12/+457 |
| | | |_|/ | | |/| | | |||||
* | | | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 |
| | | | | | |||||
* | | | | | Fix incorrect string values in enum | Fabio Berger | 2018-06-14 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fix calculation of expFilledTakerAmount and expected values in events emitted | Fabio Berger | 2018-06-14 | 1 | -4/+7 |
| | | | | | |||||
* | | | | | Replace initial set of legacy manually written fillOrder tests with ↵ | Fabio Berger | 2018-06-14 | 2 | -434/+186 |
| | | | | | | | | | | | | | | | | | | | | declarative FillScenario tests | ||||
* | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵ | Fabio Berger | 2018-06-14 | 4 | -35/+153 |
| | | | | | | | | | | | | | | | | | | | | FillScenario | ||||
* | | | | | Fix divide by zero bug | Fabio Berger | 2018-06-14 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 63 | -1012/+1928 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (26 commits) Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider Refactor sol-cov to de-duplicate code for coverage and profiling Rename popByte and popAddress Hard code test addresses/bytes32 instead of generating pseudorandom ones Update artifacts Rename computeCoverageAsync -> computeSingleTraceCoverageAsync Fix linter errors Refactor sol-cov to avoid keeping traceInfo in memory Unpop byte rather than making deep copy Pass gas in to marketBuyOrdersNoThrow Looks up the memory location of makerAssetData/takerAssetData Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA Add tests for deepCopyBytes and missing write methods from LibBytes Pop id from assetData before dispatching to AssetProxies Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 Fix import order Fix typos Add CHANGELOGs Speed-up sol-cov Increase delay when sending transactions during devnet startup ... | ||||
| * | | | | Merge pull request #694 from 0xProject/refactor-sol-cov | Alex Browne | 2018-06-13 | 5 | -306/+264 |
| |\ \ \ \ | | | | | | | | | | | | | Refactor sol-cov to de-duplicate code for coverage and profiling | ||||
| | * | | | | Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider | Alex Browne | 2018-06-13 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Refactor sol-cov to de-duplicate code for coverage and profiling | Alex Browne | 2018-06-13 | 5 | -306/+264 |
| | | | | | | |||||
| * | | | | | Merge pull request #682 from 0xProject/feature/contracts/popProxyId | Amir Bandeali | 2018-06-13 | 36 | -532/+710 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Remove proxyId checks in AssetProxies | ||||
| | * | | | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 5 | -18/+18 |
| | | | | | | |||||
| | * | | | | Hard code test addresses/bytes32 instead of generating pseudorandom ones | Amir Bandeali | 2018-06-13 | 1 | -19/+16 |
| | | | | | | |||||
| | * | | | | Update artifacts | Amir Bandeali | 2018-06-13 | 9 | -188/+182 |
| | | | | | | |||||
| | * | | | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 4 | -90/+95 |
| | | | | | | |||||
| | * | | | | Pass gas in to marketBuyOrdersNoThrow | Amir Bandeali | 2018-06-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Looks up the memory location of makerAssetData/takerAssetData | Greg Hysen | 2018-06-13 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 5 | -23/+13 |
| | | | | | | |||||
| | * | | | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 3 | -70/+201 |
| | | | | | | |||||
| | * | | | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 20 | -209/+268 |
| | |/ / / | |||||
| * | | | | Rename computeCoverageAsync -> computeSingleTraceCoverageAsync | Alex Browne | 2018-06-13 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | Fix linter errors | Alex Browne | 2018-06-13 | 3 | -10/+6 |
| | | | | | |||||
| * | | | | Refactor sol-cov to avoid keeping traceInfo in memory | Alex Browne | 2018-06-13 | 6 | -211/+76 |
| |/ / / | |||||
| * | | | Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 | Leonid Logvinov | 2018-06-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix import order | Leonid Logvinov | 2018-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #689 from 0xProject/geth-increase-startup-tx-delay | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Increase delay when sending transactions during devnet startup | ||||
| | * | | | Increase delay when sending transactions during devnet startup | Alex Browne | 2018-06-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #687 from 0xProject/feature/metacoin-docs | Leonid Logvinov | 2018-06-12 | 6 | -13/+194 |
| |\ \ \ \ | | | | | | | | | | | | | Add profiler and geth tests to metacoin | ||||
| | * | | | | Fix typos | Leonid Logvinov | 2018-06-12 | 4 | -10/+11 |
| | | | | | | |||||
| | * | | | | Fix linter issues | Leonid Logvinov | 2018-06-12 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add profiler and geth tests to metacoin | Leonid Logvinov | 2018-06-12 | 6 | -14/+194 |
| | | | | | | |||||
| * | | | | | Merge pull request #688 from 0xProject/feature/await-transaction-speedup | Leonid Logvinov | 2018-06-12 | 19 | -150/+874 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts tests | ||||
| | * | | | | | Add note to web3-wrapper CHANGELOG.json | Alex Browne | 2018-06-12 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵ | Alex Browne | 2018-06-12 | 18 | -150/+869 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | tests | ||||
| * | | | | | Merge pull request #690 from 0xProject/feature/truffle-sol-cov-fixes | Leonid Logvinov | 2018-06-12 | 4 | -7/+21 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Sol-cov fixes | ||||
| | * | | | | Add CHANGELOGs | Leonid Logvinov | 2018-06-12 | 1 | -0/+12 |
| | | | | | | |||||
| | * | | | | Speed-up sol-cov | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Don't throw when no config file is found | Leonid Logvinov | 2018-06-12 | 1 | -4/+6 |
| | | | | | | |||||
| | * | | | | Fix solidityVersion schema regex | Leonid Logvinov | 2018-06-12 | 1 | -1/+1 |
| | |/ / / | |||||
* | | | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 13 | -490/+784 |
| | | | | | |||||
* | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵ | Fabio Berger | 2018-06-13 | 4 | -9/+95 |
| | | | | | | | | | | | | | | | | | | | | superset | ||||
* | | | | | Remaining refactors of order-utils components for V2 | Fabio Berger | 2018-06-13 | 5 | -46/+48 |
| | | | | | |||||
* | | | | | For some reason order-watcher tests were timeing out so I increased the ↵ | Fabio Berger | 2018-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | timeout limit | ||||
* | | | | | Remove comment since we have added the tests | Fabio Berger | 2018-06-13 | 1 | -5/+0 |
| | | | | | |||||
* | | | | | Variable rename for clarity | Fabio Berger | 2018-06-13 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 175 | -1082/+3542 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (68 commits) Stop exporting ArtifactWriter Fix no-unused-variable tslint rule to include parameters and fix issues Fix linter exclude rule Validate all signature types rather then only ECSignatures Store the instantiated OrderValidationUtils Remove global hooks from tests and deploy contracts from within the specific tests Add EmitStatement to ASTVisitor Fix tslint issues Add back artifacts file Fix a bug in SolCompilerArtifacts adapter config overriding Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils export parseECSignature method Export ArtifactWriter from migrations package Remove unused artifact file Pass in generated contract wrapper to orderValidationUtils at instantiation Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one Refactor ExchangeTransferSimulator public interface to accet an AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations ... | ||||
| * | | | | Merge pull request #684 from ↵ | Fabio Berger | 2018-06-12 | 88 | -155/+977 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | 0xProject/fix/contract-wrappers/exchangeTransferSimulator Move ExchangeTransferSimulator & OrderValidationUtils to Order-Utils | ||||
| | * | | | Stop exporting ArtifactWriter | Fabio Berger | 2018-06-12 | 2 | -5/+0 |
| | | | | | |||||
| | * | | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 66 | -113/+104 |
| | | | | | |||||
| | * | | | Fix linter exclude rule | Fabio Berger | 2018-06-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Validate all signature types rather then only ECSignatures | Fabio Berger | 2018-06-12 | 1 | -4/+12 |
| | | | | | |||||
| | * | | | Store the instantiated OrderValidationUtils | Fabio Berger | 2018-06-12 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Remove global hooks from tests and deploy contracts from within the specific ↵ | Fabio Berger | 2018-06-12 | 2 | -54/+32 |
| | | | | | | | | | | | | | | | | | | | | tests | ||||
| | * | | | Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulator | Fabio Berger | 2018-06-12 | 44 | -481/+869 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix a bug in SolCompilerArtifacts adapter config overriding Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations Fix typos Await transactions in migrations Await fake transactions Fix a typo Implement SolidityProfiler & adapt sol-cov to work with Geth # Conflicts: # packages/migrations/CHANGELOG.json | ||||
| | * | | | | Fix tslint issues | Fabio Berger | 2018-06-12 | 5 | -8/+5 |
| | | | | | | |||||
| | * | | | | Add back artifacts file | Fabio Berger | 2018-06-12 | 1 | -0/+13 |
| | | | | | | |||||
| | * | | | | Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils | Fabio Berger | 2018-06-12 | 16 | -18/+786 |
| | | | | | | |||||
| | * | | | | export parseECSignature method | Fabio Berger | 2018-06-12 | 2 | -0/+8 |
| | | | | | | |||||
| | * | | | | Export ArtifactWriter from migrations package | Fabio Berger | 2018-06-12 | 2 | -0/+9 |
| | | | | | | |||||
| | * | | | | Remove unused artifact file | Fabio Berger | 2018-06-12 | 1 | -13/+0 |
| | | | | | | |||||
| | * | | | | Pass in generated contract wrapper to orderValidationUtils at instantiation | Fabio Berger | 2018-06-11 | 1 | -10/+25 |
| | | | | | | |||||
| | * | | | | Refactor orderValidationUtils to use the generated contract wrapper instead ↵ | Fabio Berger | 2018-06-11 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | of the higher-level one | ||||
| | * | | | | Refactor ExchangeTransferSimulator public interface to accet an ↵ | Fabio Berger | 2018-06-11 | 6 | -19/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. | ||||
| * | | | | | Add EmitStatement to ASTVisitor | Leonid Logvinov | 2018-06-12 | 1 | -0/+3 |
| | |/ / / | |/| | | | |||||
| * | | | | Fix a bug in SolCompilerArtifacts adapter config overriding | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Increase timeout for contract migrations | Leonid Logvinov | 2018-06-09 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Remove some copy-paste code | Leonid Logvinov | 2018-06-09 | 1 | -36/+6 |
| | | | | | |||||
| * | | | | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -35/+46 |
| | | | | | |||||
| * | | | | Fix typos | Leonid Logvinov | 2018-06-09 | 5 | -7/+23 |
| | | | | | |||||
| * | | | | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -4/+12 |
| | | | | | |||||
| * | | | | Await fake transactions | Leonid Logvinov | 2018-06-09 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Fix a typo | Leonid Logvinov | 2018-06-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 40 | -439/+825 |
| |/ / / | |||||
| * | | | Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFrom | Greg Hysen | 2018-06-09 | 45 | -429/+1641 |
| |\ \ \ | | | | | | | | | | | On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy | ||||
| | * | | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
| | | | | | |||||
| | * | | | Fixed assetProxyUtils for linter | Greg Hysen | 2018-06-09 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 3 | -28/+36 |
| | | | | | |||||
| | * | | | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 5 | -8/+7 |
| | | | | | |||||
| | * | | | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
| | | | | | |||||
| | * | | | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 3 | -753/+11 |
| | | | | | |||||
| | * | | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 5 | -25/+25 |
| | | | | | |||||
| | * | | | Moved some constants to global scope in assetProxyUtils | Greg Hysen | 2018-06-08 | 1 | -18/+26 |
| | | | | | |||||
| | * | | | Style updates to contracts | Greg Hysen | 2018-06-08 | 7 | -28/+23 |
| | | | | | |||||
| | * | | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 3 | -21/+6 |
| | | | | | |||||
| | * | | | Fixed a styling throughout contracts. Moved closing parenthesis for long ↵ | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
| | | | | | | | | | | | | | | | | | | | | list of function parameters to next line. | ||||
| | * | | | Removed setting makerAssetData/takerAssetData from tests where values are ↵ | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| | | | | | | | | | | | | | | | | | | | | same as defaultOrderParams. | ||||
| | * | | | Fixed merge error when rebasing wrt length variable in asset data decoders | Greg Hysen | 2018-06-08 | 2 | -4/+4 |
| | | | | | |||||
| | * | | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 7 | -16/+27 |
| | | | | | |||||
| | * | | | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 |
| | | | | | |||||
| | * | | | Fixes after rebasing | Greg Hysen | 2018-06-08 | 6 | -49/+54 |
| | | | | | |||||
| | * | | | updated migrations artifacts | Greg Hysen | 2018-06-08 | 1 | -1/+735 |
| | | | | | |||||
| | * | | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 8 | -53/+34 |
| | | | | | |||||
| | * | | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 8 | -50/+72 |
| | | | | | |||||
| | * | | | Style audit proxies | Greg Hysen | 2018-06-08 | 3 | -20/+64 |
| | | | | | |||||
| | * | | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 3 | -13/+20 |
| | | | | | |||||
| | * | | | Fixed formatting in memory layout | Greg Hysen | 2018-06-08 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Resolved edge case in Memcpy where where send would eventually turn ↵ | Greg Hysen | 2018-06-08 | 2 | -144/+154 |
| | | | | | | | | | | | | | | | | | | | | "negative" and wrap around. | ||||
| | * | | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 9 | -95/+64 |
| | | | | | | | | | | | | | | | | | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would | ||||
| | * | | | Converged on naming scheme for asset data: renamed all instances of ↵ | Greg Hysen | 2018-06-08 | 23 | -323/+290 |
| | | | | | | | | | | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
| | * | | | proxyData -> assetData | Greg Hysen | 2018-06-08 | 2 | -12/+12 |
| | | | | | |||||
| | * | | | Implement memcpy using masking and end-aligned words | Remco Bloemen | 2018-06-08 | 1 | -59/+85 |
| | | | | | |||||
| | * | | | Add tests for word loop iteration | Remco Bloemen | 2018-06-08 | 1 | -2/+6 |
| | | | | | |||||
| | * | | | Add test for zero-size overlap | Remco Bloemen | 2018-06-08 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Add test cases | Remco Bloemen | 2018-06-08 | 1 | -17/+133 |
| | | | | | |||||
| | * | | | Cleanup test script | Remco Bloemen | 2018-06-08 | 1 | -16/+1 |
| | | | | | |||||
| | * | | | Convert Solidity tests to vectors | Remco Bloemen | 2018-06-08 | 2 | -232/+6 |
| | | | | | |||||
| | * | | | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 2 | -5/+64 |
| | | | | | |||||
| | * | | | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 |
| | | | | | |||||
| | * | | | Fixed up wording in memcpy | Greg Hysen | 2018-06-08 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 6 | -32/+223 |
| | | | | | |||||
| | * | | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 6 | -5/+126 |
| | | | | | |||||
| | * | | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 3 | -35/+70 |
| | | | | | |||||
| | * | | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 8 | -2/+216 |
| | | | | | |||||
| | * | | | Tests for libMem | Greg Hysen | 2018-06-08 | 5 | -16/+80 |
| | | | | | |||||
| | * | | | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver | Greg Hysen | 2018-06-08 | 8 | -27/+581 |
| | | | | | |||||
| * | | | | Run contracts tests against Geth in CI | Alex Browne | 2018-06-08 | 1 | -0/+2 |
| |/ / / | |||||
| * | | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 41 | -79/+80 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix linter issue Fix linter issue Fix tslint issues Fix missing paths Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
| * | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-08 | 45 | -285/+288 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
| | * \ \ | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 7 | -206/+206 |
| | |\ \ \ | | | | | | | | | | | | | Remaining Order-utils V2 Changes | ||||
| | * \ \ \ | Merge pull request #670 from 0xProject/fix/generated-nesting | Fabio Berger | 2018-06-08 | 25 | -62/+65 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Remove unnecessary folder nesting | ||||
| | | * | | | | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Fix missing paths | Fabio Berger | 2018-06-08 | 2 | -5/+5 |
| | | | | | | | |||||
| | | * | | | | Fixed path | Fabio Berger | 2018-06-07 | 4 | -12/+12 |
| | | | | | | | |||||
| | | * | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 287 | -2364/+2701 |
| | | |\ \ \ \ | |||||
| | | * | | | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 26 | -65/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
| | * | | | | | | Merge pull request #676 from 0xProject/feature/mocha-source-maps | Alex Browne | 2018-06-08 | 16 | -17/+17 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | Use source-map-support package to include correct line numbers in mocha | ||||
| | | * | | | | | Use source-map-support package to include correct line numbers in mocha | Alex Browne | 2018-06-07 | 16 | -17/+17 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 286 | -2348/+2687 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx | ||||
* | | | | | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵ | Fabio Berger | 2018-06-08 | 7 | -55/+37 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder | ||||
| * | | | | | | | Fix tslint failure | Fabio Berger | 2018-06-08 | 5 | -10/+11 |
| | | | | | | | | |||||
| * | | | | | | | Pass in fee and assetAmount rather then the whole signedOrder | Fabio Berger | 2018-06-08 | 3 | -45/+26 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵ | Fabio Berger | 2018-06-08 | 5 | -183/+201 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. | ||||
| * | | | | | | | Revert to returning orderState on invalid order | Fabio Berger | 2018-06-08 | 1 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | - Refactor remainingFillableCalculator so it can be used for the maker and ↵ | Fabio Berger | 2018-06-08 | 2 | -141/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taker side - Moved the tests over from order-watcher - Did some token -> asset renaming | ||||
| * | | | | | | | Update naming in orderStateUtils to use asset over token, also removed ↵ | Fabio Berger | 2018-06-08 | 3 | -48/+40 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | cancelledAmount since in V2 it's binary. | ||||
* | | | | | | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 7 | -32/+462 |
| | | | | | | | |||||
* | | | | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 286 | -2348/+2687 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #673 from mohoff/patch-1 | Fabio Berger | 2018-06-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | typo |