| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Split into assertFillable and assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -29/+43 |
| | | |||||
| * | Disallow self filling | Remco Bloemen | 2018-08-25 | 1 | -1/+7 |
| | | |||||
| * | Remove BUG_ from revert reasons | Remco Bloemen | 2018-08-25 | 1 | -3/+3 |
| | | |||||
| * | Document accetable price check | Remco Bloemen | 2018-08-25 | 1 | -2/+16 |
| | | |||||
| * | Fix taker overpay check | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| | | |||||
| * | Check fillable early | Remco Bloemen | 2018-08-25 | 1 | -0/+6 |
| | | |||||
| * | Update for new assertValidFill signature | Remco Bloemen | 2018-08-25 | 2 | -5/+8 |
| | | |||||
| * | Add overfill and price assertion to assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -2/+32 |
| | | |||||
| * | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator tests | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
| | | |||||
| * | Test case for Trezor Model T signature | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
| | | |||||
| * | Fixed trezor personal message in client+contracts; added a test using ↵ | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
| | | | | | message signed by Trezor One (firmware v1.6.2) | ||||
| * | Remove Trezor SignatureType | Amir Bandeali | 2018-08-25 | 3 | -77/+1 |
| | | |||||
| * | Remove SignatureType.Caller | Amir Bandeali | 2018-08-25 | 4 | -57/+16 |
| | | |||||
| * | Rethrow Wallet and Validator errors | Amir Bandeali | 2018-08-25 | 3 | -22/+42 |
| | | |||||
| * | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 6 | -15/+16 |
| | | |||||
| * | Revert if undefined function called in AssetProxies | Amir Bandeali | 2018-08-25 | 3 | -1/+29 |
| | | |||||
| * | Remove pragma experimental v0.5.0 and use staticcall is assembly | Amir Bandeali | 2018-08-25 | 6 | -15/+198 |
| | | |||||
| * | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 7 | -2/+123 |
| | | |||||
| * | Publishethereum-types@1.0.5contracts@2.1.41@0xproject/website@0.0.45@0xproject/web3-wrapper@2.0.0@0xproject/utils@1.0.6@0xproject/typescript-typings@1.0.5@0xproject/types@1.0.1-rc.5@0xproject/tslint-config@1.0.6@0xproject/testnet-faucets@1.0.42@0xproject/subproviders@2.0.0@0xproject/sra-report@1.0.6@0xproject/sra-api@1.0.1-rc.5@0xproject/sol-resolver@1.0.6@0xproject/sol-cov@2.1.0@0xproject/sol-compiler@1.1.0@0xproject/react-shared@1.0.7@0xproject/react-docs@1.0.6@0xproject/order-watcher@1.0.1-rc.4@0xproject/order-utils@1.0.1-rc.4@0xproject/monorepo-scripts@1.0.6@0xproject/migrations@1.0.5@0xproject/metacoin@0.0.16@0xproject/json-schemas@1.0.1-rc.5@0xproject/forwarder-helper@1.0.1-rc.1@0xproject/fill-scenarios@1.0.1-rc.4@0xproject/dev-utils@1.0.5@0xproject/contract-wrappers@1.0.1-rc.4@0xproject/connect@2.0.0-rc.1@0xproject/base-contract@2.0.0@0xproject/assert@1.0.6@0xproject/abi-gen@1.0.60x.js@1.0.1-rc.4 | Fabio Berger | 2018-08-25 | 1 | -22/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.4 - @0xproject/abi-gen@1.0.6 - @0xproject/assert@1.0.6 - @0xproject/base-contract@2.0.0 - @0xproject/connect@2.0.0-rc.1 - @0xproject/contract-wrappers@1.0.1-rc.4 - contracts@2.1.41 - @0xproject/dev-utils@1.0.5 - ethereum-types@1.0.5 - @0xproject/fill-scenarios@1.0.1-rc.4 - @0xproject/forwarder-helper@1.0.1-rc.1 - @0xproject/json-schemas@1.0.1-rc.5 - @0xproject/metacoin@0.0.16 - @0xproject/migrations@1.0.5 - @0xproject/monorepo-scripts@1.0.6 - @0xproject/order-utils@1.0.1-rc.4 - @0xproject/order-watcher@1.0.1-rc.4 - @0xproject/react-docs@1.0.6 - @0xproject/react-shared@1.0.7 - @0xproject/sol-compiler@1.1.0 - @0xproject/sol-cov@2.1.0 - @0xproject/sol-resolver@1.0.6 - @0xproject/sra-api@1.0.1-rc.5 - @0xproject/sra-report@1.0.6 - @0xproject/subproviders@2.0.0 - @0xproject/testnet-faucets@1.0.42 - @0xproject/tslint-config@1.0.6 - @0xproject/types@1.0.1-rc.5 - @0xproject/typescript-typings@1.0.5 - @0xproject/utils@1.0.6 - @0xproject/web3-wrapper@2.0.0 - @0xproject/website@0.0.45 | ||||
| * | Fix many linter errors that showed up upon upgrading tsutil | Fabio Berger | 2018-08-23 | 3 | -4/+4 |
| | | |||||
| * | Merge development branch | Fabio Berger | 2018-08-22 | 47 | -688/+2197 |
| |\ | |||||
| | * | Add getBalancesAndAllowances | Amir Bandeali | 2018-08-22 | 2 | -0/+69 |
| | | | |||||
| | * | Add ZRX balances and allowances to TraderInfo | Amir Bandeali | 2018-08-22 | 2 | -10/+122 |
| | | | |||||
| | * | Add tests | Amir Bandeali | 2018-08-22 | 5 | -1/+451 |
| | | | |||||
| | * | Don't throw if ERC721 token isn't owned | Amir Bandeali | 2018-08-22 | 1 | -1/+51 |
| | | | |||||
| | * | Add OrderValidator contract | Amir Bandeali | 2018-08-22 | 14 | -23/+163 |
| | | | |||||
| | * | Remove redundant constructor args | Amir Bandeali | 2018-08-22 | 3 | -10/+8 |
| | | | |||||
| | * | fix(sol-cov): Remove old files and update config.contractsDir | Alex Browne | 2018-08-21 | 1 | -1/+1 |
| | | | |||||
| | * | Fix typos, run prettier, and allow anyone to call on DummyERC721Token | Amir Bandeali | 2018-08-17 | 6 | -14/+14 |
| | | | |||||
| | * | Fix Geth tests | Amir Bandeali | 2018-08-17 | 1 | -9/+9 |
| | | | |||||
| | * | Fix linting errors | Amir Bandeali | 2018-08-17 | 8 | -11/+10 |
| | | | |||||
| | * | Fix tests that assumed logs were being filtered | Amir Bandeali | 2018-08-17 | 4 | -4/+11 |
| | | | |||||
| | * | Add tests for ERC721Token | Amir Bandeali | 2018-08-17 | 4 | -2/+281 |
| | | | |||||
| | * | Add ERC721Receiver that returns incorrect value | Amir Bandeali | 2018-08-17 | 3 | -1/+68 |
| | | | |||||
| | * | Increase max mintable amount | Amir Bandeali | 2018-08-17 | 1 | -1/+1 |
| | | | |||||
| | * | Fix DummyERC721Receiver | Amir Bandeali | 2018-08-17 | 1 | -32/+32 |
| | | | |||||
| | * | Add tests for ERC20 token with no return values | Amir Bandeali | 2018-08-17 | 6 | -5/+261 |
| | | | |||||
| | * | Add constructor back to DummyERC721Token | Amir Bandeali | 2018-08-17 | 2 | -0/+14 |
| | | | |||||
| | * | Restructure directories | Amir Bandeali | 2018-08-17 | 6 | -52/+103 |
| | | | |||||
| | * | Update checking for erc721 existence | Amir Bandeali | 2018-08-17 | 1 | -3/+2 |
| | | | |||||
| | * | Update ERC20Token | Amir Bandeali | 2018-08-17 | 6 | -47/+113 |
| | | | |||||
| | * | Optimize ERC721Token | Amir Bandeali | 2018-08-17 | 5 | -510/+462 |
| | | | |||||
| * | | Move types from sol-compiler to types so they can be used in other places ↵ | Fabio Berger | 2018-08-22 | 3 | -3/+3 |
| | | | | | | | | | without requiring sol-compiler as a dep | ||||
| * | | Fix comment | Fabio Berger | 2018-08-17 | 1 | -1/+2 |
| | | | |||||
| * | | Merge development | Fabio Berger | 2018-08-17 | 5 | -3/+45 |
| |\| | |||||
| | * | Merge pull request #928 from 0xProject/dependabot/npm_and_yarn/copyfiles-2.0.0 | Fabio Berger | 2018-08-17 | 1 | -1/+1 |
| | |\ | | | | | | | Bump copyfiles from 1.2.0 to 2.0.0 | ||||
| | | * | Bump copyfiles from 1.2.0 to 2.0.0 | dependabot[bot] | 2018-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Bumps [copyfiles](https://github.com/calvinmetcalf/copyfiles) from 1.2.0 to 2.0.0. - [Release notes](https://github.com/calvinmetcalf/copyfiles/releases) - [Commits](https://github.com/calvinmetcalf/copyfiles/compare/v1.2.0...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com> | ||||
| | * | | [Order-utils] Order is valid when maker amount is very small | Jacob Evans | 2018-08-15 | 4 | -1/+43 |
| | |/ | | | | | | | | | | | | | Previously our min fillable calculation would throw a rounding error when encountering a valid order (with a small maker amount). This was inconsistent with the on-chain logic which allowed this order to be filled. | ||||
| | * | feat: Upgrade TypeScript to 3.0.1 | Alex Browne | 2018-08-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge development | Fabio Berger | 2018-08-15 | 22 | -255/+292 |
| |\| | |||||
| | * | Publish | Alex Browne | 2018-08-14 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.3 - @0xproject/abi-gen@1.0.5 - @0xproject/assert@1.0.5 - @0xproject/base-contract@2.0.0-rc.1 - @0xproject/connect@1.0.5 - @0xproject/contract-wrappers@1.0.1-rc.3 - contracts@2.1.40 - @0xproject/dev-utils@1.0.4 - ethereum-types@1.0.4 - @0xproject/fill-scenarios@1.0.1-rc.3 - @0xproject/json-schemas@1.0.1-rc.4 - @0xproject/metacoin@0.0.15 - @0xproject/migrations@1.0.4 - @0xproject/monorepo-scripts@1.0.5 - @0xproject/order-utils@1.0.1-rc.3 - @0xproject/order-watcher@1.0.1-rc.3 - @0xproject/react-docs@1.0.5 - @0xproject/react-docs-example@0.0.20 - @0xproject/react-shared@1.0.6 - @0xproject/sol-compiler@1.0.5 - @0xproject/sol-cov@2.0.0 - @0xproject/sol-resolver@1.0.5 - @0xproject/sra-api@1.0.1-rc.4 - @0xproject/sra-report@1.0.5 - @0xproject/subproviders@1.0.5 - @0xproject/testnet-faucets@1.0.41 - @0xproject/tslint-config@1.0.5 - @0xproject/types@1.0.1-rc.4 - @0xproject/typescript-typings@1.0.4 - @0xproject/utils@1.0.5 - @0xproject/web3-wrapper@1.2.0 - @0xproject/website@0.0.44 | ||||
| | * | Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-string | Jacob Evans | 2018-08-14 | 1 | -6/+6 |
| | |\ | | | | | | | 0x.js Return signature as a hex encoded string | ||||
| | | * | Rename from SignerProviderType.EthSign to SignerType.Default | Jacob Evans | 2018-08-11 | 1 | -5/+5 |
| | | | | |||||
| | | * | Introduce SignerProviderType | Jacob Evans | 2018-08-09 | 1 | -6/+6 |
| | | | | | | | | | | | | | This allows the developer to indicate the nuanced signer provider. Some have different implementations (trezor, ledger) and others have different implementations (metamask). Breaking the abstraction of eth_sign. EthSign assumes a spec compliant implementation and can be used as a default | ||||
| | * | | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoK | Amir Bandeali | 2018-08-10 | 10 | -163/+84 |
| | |\ \ | | | | | | | | | [contracts] Make marketBuy functions revert if entire amount not filled | ||||
| | | * | | Change withdrawERC20 => withdrawAsset, reuse transfer logic | Amir Bandeali | 2018-08-10 | 6 | -22/+40 |
| | | | | | |||||
| | | * | | Make marketBuy functions revert if entire amount not filled | Amir Bandeali | 2018-08-10 | 6 | -141/+44 |
| | | | | | |||||
| | * | | | fix: Update dependencies | Alex Browne | 2018-08-10 | 1 | -2/+2 |
| | |/ / | |||||
| | * | | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTests | Amir Bandeali | 2018-08-10 | 6 | -23/+98 |
| | |\ \ | | |/ | |/| | [contracts] Test fillOrder return values and abiEncodeFillOrder | ||||
| | | * | Revert incrementing memory ptr in dispatchTransferFrom | Amir Bandeali | 2018-08-09 | 3 | -9/+3 |
| | | | | |||||
| | | * | Test abiEncodeFillOrder as part of combinatorial follOrder tests | Amir Bandeali | 2018-08-09 | 3 | -5/+24 |
| | | | | |||||
| | | * | Increment free memory pointer for internal Exchange functions that use asm | Amir Bandeali | 2018-08-09 | 3 | -12/+34 |
| | | | | |||||
| | | * | Add return values to combinatorial fillOrder tests | Amir Bandeali | 2018-08-09 | 2 | -11/+51 |
| | | | | |||||
| | * | | Merge pull request #915 from 0xProject/feature/encode-decode-checks | Alex Browne | 2018-08-09 | 1 | -3/+3 |
| | |\ \ | | |/ | |/| | Add strictArgumentEncodingCheck to BaseContract and use it in contract templates | ||||
| | | * | Add strictArgumentEncodingCheck to BaseContract and use it in contract templates | Alex Browne | 2018-08-09 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorComments | Amir Bandeali | 2018-08-09 | 1 | -4/+9 |
| | |\ \ | | |/ | |/| | [contracts] Fix comments and styling for MixinSignatureValidator | ||||
| | | * | fix comments and styling for MixinSignatureValidator | Amir Bandeali | 2018-08-09 | 1 | -4/+9 |
| | | | | |||||
| | * | | Merge pull request #945 from 0xProject/fix/typescript-2.9.2 | Alex Browne | 2018-08-09 | 2 | -5/+20 |
| | |\ \ | | |/ | |/| | Update TypeScript to version 2.9.2 | ||||
| | | * | Update TypeScript to version 2.9.2 | Alex Browne | 2018-08-09 | 2 | -5/+20 |
| | | | | |||||
| | * | | Use asm for hashEIP712Message, increment free memory pointer after asm ↵ | Amir Bandeali | 2018-08-09 | 2 | -9/+28 |
| | | | | | | | | | | | | | hashing functions | ||||
| | * | | Fix comments, styling, and optimize hashOrder | Amir Bandeali | 2018-08-08 | 3 | -25/+33 |
| | |/ | |||||
| * | | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with caps | Fabio Berger | 2018-08-04 | 2 | -5/+5 |
| | | | |||||
| * | | Stop exporting crypto | Fabio Berger | 2018-08-03 | 1 | -1/+2 |
| | | | |||||
| * | | Make signature_util into an object literal so related functions are rendered ↵ | Fabio Berger | 2018-08-03 | 1 | -5/+17 |
| | | | | | | | | | together in the docs | ||||
| * | | Add missing doc comments | Fabio Berger | 2018-08-03 | 1 | -0/+6 |
| |/ | |||||
| * | Add combinatorial tests for internal Exchange functions (#807) | Alex Browne | 2018-07-27 | 12 | -128/+756 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP add combinatorial tests for internal Exchange functions * Change combinitorial testing strategy based on feedback * Check value of filled[orderHash] in updateFilledState tests * Add combinatorial tests for addFillResults * Add combinatorial tests for getPartialAmount * Implement generic `testWithReferenceFuncAsync` * Implement generic `testCombinatoriallyWithReferenceFuncAsync` * Add combinatorial tests for isRoundingError * Add combinatorial tests for calculateFillResults * Add support for Geth in internal contract tests * Fix contract artifacts * Change DECIMAL_PLACES to 78 and add a note. * Document new functions in utils * Optimize tests by only reseting state when needed * Rename/move some files * Print parameter names on failure in testWithReferenceFuncAsync * Add to changelog for utils package * Appease various linters * Rename some more things related to FillOrderCombinatorialUtils * Remove .only from test/exchange/internal.ts * Remove old test for isRoundingError and getPartialAmount * Appease linters again * Remove old todos * Fix typos, add comments, rename some things * Re-add some LibMath tests * Update contract internal tests to use new SafeMath revert reasons * Apply PR feedback from Amir * Apply PR feedback from Remco * Re-add networks to ZRXToken artifact * Remove duplicate Whitelist in compiler.json | ||||
| * | Publishcontracts@2.1.39@0xproject/website@0.0.43@0xproject/testnet-faucets@1.0.40@0xproject/react-docs-example@0.0.19@0xproject/metacoin@0.0.14@0xproject/abi-gen@1.0.4 | Fabio Berger | 2018-07-26 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.2 - @0xproject/abi-gen@1.0.4 - @0xproject/assert@1.0.4 - @0xproject/base-contract@1.0.4 - @0xproject/connect@1.0.4 - @0xproject/contract-wrappers@1.0.1-rc.2 - contracts@2.1.39 - @0xproject/dev-utils@1.0.3 - @0xproject/fill-scenarios@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.3 - @0xproject/metacoin@0.0.14 - @0xproject/migrations@1.0.3 - @0xproject/order-utils@1.0.1-rc.2 - @0xproject/order-watcher@1.0.1-rc.2 - @0xproject/react-docs@1.0.4 - @0xproject/react-docs-example@0.0.19 - @0xproject/react-shared@1.0.5 - @0xproject/sol-compiler@1.0.4 - @0xproject/sol-cov@1.0.3 - @0xproject/sol-resolver@1.0.4 - @0xproject/sra-report@1.0.4 - @0xproject/subproviders@1.0.4 - @0xproject/testnet-faucets@1.0.40 - @0xproject/types@1.0.1-rc.3 - @0xproject/utils@1.0.4 - @0xproject/web3-wrapper@1.1.2 - @0xproject/website@0.0.43 | ||||
| * | Point to actual current version | Fabio Berger | 2018-07-26 | 1 | -3/+3 |
| | | |||||
| * | Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3 | Fabio Berger | 2018-07-26 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.2 - @0xproject/abi-gen@1.0.3 - @0xproject/assert@1.0.3 - @0xproject/base-contract@1.0.3 - @0xproject/connect@1.0.3 - @0xproject/contract-wrappers@1.0.1-rc.2 - contracts@2.1.38 - @0xproject/dev-utils@1.0.3 - ethereum-types@1.0.3 - @0xproject/fill-scenarios@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.2 - @0xproject/metacoin@0.0.13 - @0xproject/migrations@1.0.3 - @0xproject/monorepo-scripts@1.0.4 - @0xproject/order-utils@1.0.1-rc.2 - @0xproject/order-watcher@1.0.1-rc.2 - @0xproject/react-docs@1.0.3 - @0xproject/react-docs-example@0.0.18 - @0xproject/react-shared@1.0.4 - @0xproject/sol-compiler@1.0.3 - @0xproject/sol-cov@1.0.3 - @0xproject/sol-resolver@1.0.3 - @0xproject/sra-report@1.0.3 - @0xproject/subproviders@1.0.3 - @0xproject/testnet-faucets@1.0.39 - @0xproject/tslint-config@1.0.4 - @0xproject/types@1.0.1-rc.2 - @0xproject/typescript-typings@1.0.3 - @0xproject/utils@1.0.3 - @0xproject/web3-wrapper@1.1.1 - @0xproject/website@0.0.42 | ||||
| * | Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2 | Fabio Berger | 2018-07-26 | 1 | -22/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.1 - @0xproject/abi-gen@1.0.2 - @0xproject/assert@1.0.2 - @0xproject/base-contract@1.0.2 - @0xproject/connect@1.0.2 - @0xproject/contract-wrappers@1.0.1-rc.1 - contracts@2.1.37 - @0xproject/dev-utils@1.0.2 - ethereum-types@1.0.2 - @0xproject/fill-scenarios@1.0.1-rc.1 - @0xproject/json-schemas@1.0.1-rc.1 - @0xproject/metacoin@0.0.12 - @0xproject/migrations@1.0.2 - @0xproject/monorepo-scripts@1.0.3 - @0xproject/order-utils@1.0.1-rc.1 - @0xproject/order-watcher@1.0.1-rc.1 - @0xproject/react-docs@1.0.2 - @0xproject/react-docs-example@0.0.17 - @0xproject/react-shared@1.0.3 - @0xproject/sol-compiler@1.0.2 - @0xproject/sol-cov@1.0.2 - @0xproject/sol-resolver@1.0.2 - @0xproject/sra-report@1.0.2 - @0xproject/subproviders@1.0.2 - @0xproject/testnet-faucets@1.0.38 - @0xproject/tslint-config@1.0.3 - @0xproject/types@1.0.1-rc.1 - @0xproject/typescript-typings@1.0.2 - @0xproject/utils@1.0.2 - @0xproject/web3-wrapper@1.1.0 - @0xproject/website@0.0.41 | ||||
| * | Revert to publishing ethereum-types | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | | |||||
| * | Temporarily have all packages depend on an older, published version of ↵ | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
| | | | | | ethereum-types since we cannot publish a new one | ||||
| * | Modify WETH9 event arg names to be identical to ERC20 standard suggested names | Fabio Berger | 2018-07-26 | 1 | -4/+4 |
| | | |||||
| * | merge v2-prototype | Fabio Berger | 2018-07-25 | 2 | -2/+2 |
| |\ | |||||
| | * | Update orderEpoch comments | Amir Bandeali | 2018-07-25 | 2 | -2/+2 |
| | | | |||||
| * | | Revert "Revert "Publish"" | Fabio Berger | 2018-07-24 | 1 | -16/+16 |
| |/ | | | | This reverts commit a66ccaa1da2af753038bf22a5e7e63bdc307bf2f. | ||||
| * | Remove ERC721 callback functions | Amir Bandeali | 2018-07-23 | 4 | -49/+3 |
| | | |||||
| * | Use != instead of > in loops, add sanity checks to market fill functions | Amir Bandeali | 2018-07-23 | 3 | -19/+19 |
| | | |||||
| * | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 7 | -411/+483 |
| | | |||||
| * | Remove MConstants and MixinConstants for LibConstants | Amir Bandeali | 2018-07-23 | 8 | -57/+23 |
| | | |||||
| * | Remove redundant external call by reimplementing fillOrderNoThrow | Amir Bandeali | 2018-07-23 | 6 | -166/+355 |
| | | |||||
| * | Remove orders length check | Amir Bandeali | 2018-07-23 | 2 | -11/+0 |
| | | |||||
| * | Add assertValidFillResults | Amir Bandeali | 2018-07-23 | 1 | -61/+88 |
| | | |||||
| * | Get actual gasPrice from transaction instead of setting default | Amir Bandeali | 2018-07-23 | 1 | -35/+34 |
| | | |||||
| * | Store orders length in varible before looping over orders | Amir Bandeali | 2018-07-23 | 2 | -14/+25 |
| | | |||||
| * | Use transferFrom instead of safeTransferFrom | Amir Bandeali | 2018-07-23 | 2 | -6/+2 |
| | | |||||
| * | Fix minimal tests | Amir Bandeali | 2018-07-23 | 3 | -729/+747 |
| | | |||||
| * | Fix rounding error issues, use different logic when makerAsset is ZRX | Amir Bandeali | 2018-07-23 | 6 | -52/+95 |
| | | |||||
| * | Rename marketSellEth => marketSellWeth | Amir Bandeali | 2018-07-23 | 2 | -3/+3 |
| | | |||||
| * | Update percentage constants | Amir Bandeali | 2018-07-23 | 3 | -17/+18 |
| | | |||||
| * | Update transferEthFeeAndRefund, add check to ERC721 transfer | Amir Bandeali | 2018-07-23 | 6 | -26/+54 |
| | | |||||
| * | Refactor forwarding contract architecture, remove batch functions | Amir Bandeali | 2018-07-23 | 20 | -1038/+572 |
| | | |||||
| * | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 5 | -1/+77 |
| | | |||||
| * | Add comments for deploying with constant ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 2 | -2/+15 |
| | | |||||
| * | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 10 | -24/+33 |
| | | |||||
| * | Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback | Amir Bandeali | 2018-07-23 | 5 | -188/+31 |
| |\ | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy. | ||||
| | * | Fixed merge errors | Greg Hysen | 2018-07-18 | 1 | -2/+0 |
| | | | |||||
| | * | Fixed merge error | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| | | | |||||
| | * | Ran prettier | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| | | | |||||
| | * | Removed receiverData from ERC721 Proxy Id generation | Greg Hysen | 2018-07-18 | 4 | -8/+6 |
| | | | |||||
| | * | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 3 | -178/+25 |
| | | | |||||
| * | | Fix version of ethereumjs-abi to 0.6.5 to fix decoding bug | Fabio Berger | 2018-07-22 | 1 | -1/+1 |
| | | | |||||
| * | | fix decodeAssetData for addresses starting in 0 | Luke Autry | 2018-07-22 | 1 | -2/+2 |
| | | | |||||
| * | | Hard code fillOrder selector into abiEncodeFillOrder | Amir Bandeali | 2018-07-20 | 1 | -7/+4 |
| | | | |||||
| * | | Returns byte array instead of memory range for encoding fillOrder calldata | Greg Hysen | 2018-07-20 | 2 | -24/+26 |
| | | | |||||
| * | | Created LibAbiEncoder with `fillOrderNoThrow` | Greg Hysen | 2018-07-20 | 2 | -170/+235 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/sol-cov@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/sol-compiler@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/dev-utils@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/subproviders@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/base-contract@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/web3-wrapper@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/abi-gen@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/utils@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/types@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/tslint-config@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new @0xproject/typescript-typings@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | Change all package to depend on the new ethereum-types@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | merge v2-prototype | Fabio Berger | 2018-07-18 | 2 | -1/+2 |
| |\ \ | |||||
| | * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 18 | -182/+201 |
| | |\| | |||||
| | * | | Merge | Leonid Logvinov | 2018-07-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 29 | -186/+534 |
| | |\ \ | |||||
| | * | | | Upgrade tslint to use prefer-readonly | Leonid Logvinov | 2018-07-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update contract artifacts | Leonid Logvinov | 2018-07-13 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Update package versions | Fabio Berger | 2018-07-18 | 1 | -10/+10 |
| | |_|/ |/| | | |||||
| * | | | Merge pull request #884 from 0xProject/export-more-0x.js | Fabio Berger | 2018-07-18 | 18 | -182/+201 |
| |\ \ \ | |_|/ |/| | | Export missing V2 pieces from 0x.js | ||||
| | * | | Fix prettier | Fabio Berger | 2018-07-18 | 2 | -9/+3 |
| | | | | |||||
| | * | | Fix linter | Fabio Berger | 2018-07-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | merge v2-prototype | Fabio Berger | 2018-07-18 | 15 | -138/+484 |
| | |\ \ | |||||
| | * | | | Rename decodeAssetDataId to decodeAssetProxyId for consistency | Fabio Berger | 2018-07-18 | 4 | -11/+11 |
| | | | | | |||||
| | * | | | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ↵ | Fabio Berger | 2018-07-18 | 4 | -6/+31 |
| | | | | | | | | | | | | | | | | | them exported | ||||
| | * | | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 16 | -176/+176 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #883 from 0xProject/feature/tslint-improvements | Leonid Logvinov | 2018-07-18 | 16 | -48/+50 |
| |\ \ \ | |_|/ |/| | | New tslint rules | ||||
| | * | | Fix tslint issues | Leonid Logvinov | 2018-07-17 | 15 | -47/+49 |
| | | | | |||||
| | * | | Upgrade tslint to the newest version | Leonid Logvinov | 2018-07-17 | 1 | -1/+1 |
| | |/ | |||||
| * | | Add tests for getOrderInfo and getOrdersInfo | Amir Bandeali | 2018-07-18 | 3 | -5/+311 |
| | | | |||||
| * | | Reorder checks in getOrderInfo | Amir Bandeali | 2018-07-18 | 1 | -7/+9 |
| | | | |||||
| * | | Add getOrdersInfo function | Amir Bandeali | 2018-07-18 | 2 | -0/+24 |
| | | | |||||
| * | | Fix bugs having to do with block timestamps and order expirationTimes | Alex Browne | 2018-07-17 | 11 | -128/+142 |
| |/ | |||||
| * | Remove extra ERC20ProxyId from Forwarder constructor | Jacob Evans | 2018-07-11 | 2 | -3/+1 |
| | | |||||
| * | Add Migrations for Forwarder | Jacob Evans | 2018-07-11 | 1 | -2/+2 |
| | | |||||
| * | Add revert reasons and optimization to safeMath | Amir Bandeali | 2018-07-11 | 1 | -3/+15 |
| | | |||||
| * | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 7 | -17/+76 |
| | | |||||
| * | Update package versions | Fabio Berger | 2018-07-10 | 1 | -11/+11 |
| | | |||||
| * | Move functions out of Forwarder.sol | Amir Bandeali | 2018-07-08 | 12 | -42/+35 |
| | | |||||
| * | Add interfaces and mixins | Amir Bandeali | 2018-07-08 | 16 | -61/+573 |
| | | |||||
| * | Combine mixins | Amir Bandeali | 2018-07-08 | 6 | -284/+218 |
| | | |||||
| * | Use interfaces instead of full contracts | Amir Bandeali | 2018-07-08 | 4 | -7/+39 |
| | | |||||
| * | Add lint-contracts to default lint command | Amir Bandeali | 2018-07-07 | 1 | -1/+1 |
| | | |||||
| * | Remove TODOs that won't be addressed | Amir Bandeali | 2018-07-07 | 4 | -10/+3 |
| | | |||||
| * | Remove AbiV2 where unused | Amir Bandeali | 2018-07-07 | 23 | -38/+27 |
| | | |||||
| * | Only reset currentContextAddress if it was previously updated | Amir Bandeali | 2018-07-07 | 1 | -8/+11 |
| | | |||||
| * | Change uint => uint256 | Amir Bandeali | 2018-07-07 | 1 | -8/+7 |
| | | |||||
| * | Apply new linter rules | Amir Bandeali | 2018-07-07 | 74 | -299/+351 |
| | | |||||
| * | Update linter config | Amir Bandeali | 2018-07-07 | 2 | -11/+14 |
| | | |||||
| * | Fix imports | Leonid Logvinov | 2018-07-06 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP | Leonid Logvinov | 2018-07-06 | 14 | -66/+68 |
| |\ | | | | | V2 contract wrappers | ||||
| | * | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 14 | -66/+68 |
| | | | |||||
| * | | Types: Move Forwarder Revert Reason into types package | Jacob Evans | 2018-07-06 | 1 | -13/+6 |
| | | | |||||
| * | | Forwarder specify the revert reasons | Jacob Evans | 2018-07-06 | 1 | -21/+31 |
| | | | |||||
| * | | Forwarder fix linter error | Jacob Evans | 2018-07-06 | 1 | -1/+1 |
| | | | |||||
| * | | Update to new assertions | Jacob Evans | 2018-07-06 | 1 | -18/+16 |
| | | | |||||
| * | | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 18 | -8/+2163 |
| |\ \ | | | | | | | Forwarding contract | ||||
| | * | | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 18 | -8/+2163 |
| | | | | |||||
| * | | | Contracts 2.0.0 were linted with solhint | Alex Shafranovich | 2018-07-06 | 60 | -1/+78 |
| | | | | |||||
| * | | | Added Solhint package and 'lint-contracts' npm script | Alex Shafranovich | 2018-07-06 | 2 | -1/+20 |
| | |/ |/| | |||||
| * | | merge v2-prototype | Fabio Berger | 2018-07-04 | 17 | -186/+235 |
| |\ \ | |||||
| | * | | Move NodeType caching out of web3-wrapper and into our internal code | Alex Browne | 2018-07-04 | 1 | -2/+8 |
| | | | | |||||
| | * | | Add TransactionReceiptStatus type to ethereum-types | Alex Browne | 2018-07-04 | 1 | -2/+2 |
| | | | | |||||
| | * | | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 17 | -185/+228 |
| | | | | |||||
| * | | | Remove unused imported Web3.js | Fabio Berger | 2018-07-04 | 1 | -2/+1 |
| |/ / | |||||
| * | | Update incorrect versions of deps | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Fix bug where 18 decimal tokens instead of 5 decimal tokens created | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Disable custom-no-magic-number for block | Fabio Berger | 2018-07-02 | 1 | -0/+2 |
| | | | |||||
| * | | Remove unused variable | Fabio Berger | 2018-07-02 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 130 | -936/+874 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (75 commits) Update relayer grid tiles to use Text Fix build Update file structure Update 2.0.0 artifacts Move ledgerhq module declarations to typescript-typings Export LedgerEthereumClient type in subproviders Update artifacts Add logging and updated artifacts Fix migrations Run prettier Add Kovan artifacts Use ledger subprovider Add Kovan migrations Remove state variable from Link component in Portal Make registerAssetProxy append only Update staging api link Change getTransactionReceipt to awaitTransactionMined Move /docs route to the end Remove extra call to scrollIntoView for wallet in onboarding Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes ... | ||||
| | * | Fix build | Amir Bandeali | 2018-06-30 | 7 | -31/+31 |
| | | | |||||
| | * | Update file structure | Amir Bandeali | 2018-06-30 | 125 | -199/+195 |
| | | | |||||
| | * | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 11 | -201/+67 |
| | | | |||||
| | * | Change getTransactionReceipt to awaitTransactionMined | Amir Bandeali | 2018-06-30 | 1 | -1/+1 |
| | | | |||||
| | * | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 2 | -27/+38 |
| | | | |||||
| | * | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 2 | -7/+6 |
| | | | |||||
| | * | Fix tests | Amir Bandeali | 2018-06-30 | 6 | -79/+146 |
| | | | |||||
| | * | Remove transferFrom, implement in fallback function | Amir Bandeali | 2018-06-30 | 6 | -290/+267 |
| | | | |||||
| | * | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments | Amir Bandeali | 2018-06-30 | 2 | -0/+22 |
| | |\ | | | | | | | Added some comments for ASM hashing | ||||
| | | * | Updated hashing comments as-per PR | Greg Hysen | 2018-06-29 | 1 | -9/+4 |
| | | | | |||||
| | | * | Comments for ASM hashing | Greg Hysen | 2018-06-26 | 2 | -0/+27 |
| | | | | |||||
| * | | | Add commented out scenarios not run by default | Fabio Berger | 2018-07-02 | 1 | -16/+82 |
| | | | | |||||
| * | | | Fix comment | Fabio Berger | 2018-07-02 | 1 | -2/+1 |
| | | | | |||||
| * | | | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 |
| | | | | |||||
| * | | | Transfer ERC721 token instead of burning, so we can still set an allowance ↵ | Fabio Berger | 2018-07-02 | 1 | -1/+9 |
| | | | | | | | | | | | | | to it in tests | ||||
| * | | | Fix bug where using nullAddress for order instead of actual taker address | Fabio Berger | 2018-07-02 | 1 | -11/+3 |
| | | | | |||||
| * | | | Add maker and taker balance/allowance scenarios to generateFillOrderCombination | Fabio Berger | 2018-07-02 | 1 | -8/+24 |
| |/ / | |||||
| * | | Remove unused constants | Fabio Berger | 2018-06-28 | 1 | -2/+0 |
| | | | |||||
| * | | Reduce the userAddresses to the individual addresses actually used by tests, ↵ | Fabio Berger | 2018-06-28 | 7 | -19/+32 |
| | | | | | | | | | as well as only deploy the number of ERC20 tokens needed for each test suite | ||||
| * | | Add await time constant | Fabio Berger | 2018-06-28 | 1 | -0/+2 |
| | | | |||||
| * | | Add missing awaitTransactionSuccessAsync calls | Fabio Berger | 2018-06-28 | 1 | -6/+10 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 18 | -736/+363 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Improve 'web3-provider-engine' typings Fix build Update artifacts Add more revert reasons to tests Make dispatchTransferFrom revert with reason from AssetProxy on failure Remove redundant files, hard code function selector in dispatchTransferFrom, and modify revert reason Updated offset of receiverData length to reflect new assetData encoding. ERC20 Custom storage layout Golf the authorization check ERC20 manual memory layout ERC20 inline return ERC721 inline return Golf ERC721 transferFrom Inline ERC20 tranferFrom selector constant Optimize ERC20 transferFrom Polish asset picker layout Update relayer grid fallback icon Change metamask install link based on browser Use ethereumjs-tx@1.3.5 instead of our fork # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts # packages/migrations/artifacts/2.0.0/DummyERC721Token.json | ||||
| | * | | Fix build | Amir Bandeali | 2018-06-27 | 1 | -0/+3 |
| | | | | |||||
| | * | | Add more revert reasons to tests | Amir Bandeali | 2018-06-27 | 3 | -19/+43 |
| | | | | |||||
| | * | | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 2 | -7/+6 |
| | | | | |||||
| | * | | Remove redundant files, hard code function selector in dispatchTransferFrom, ↵ | Amir Bandeali | 2018-06-27 | 17 | -896/+201 |
| | | | | | | | | | | | | | and modify revert reason | ||||
| | * | | Updated offset of receiverData length to reflect new assetData encoding. | Greg Hysen | 2018-06-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | ERC20 Custom storage layout | Remco Bloemen | 2018-06-27 | 2 | -3/+5 |
| | | | | |||||
| | * | | Golf the authorization check | Remco Bloemen | 2018-06-27 | 2 | -122/+132 |
| | | | | |||||
| | * | | ERC20 manual memory layout | Remco Bloemen | 2018-06-27 | 1 | -11/+6 |
| | | | | |||||
| | * | | ERC20 inline return | Remco Bloemen | 2018-06-27 | 1 | -6/+11 |
| | | | | |||||
| | * | | ERC721 inline return | Remco Bloemen | 2018-06-27 | 1 | -8/+9 |
| | | | | |||||
| | * | | Golf ERC721 transferFrom | Remco Bloemen | 2018-06-27 | 2 | -3/+166 |
| | | | | |||||
| | * | | Inline ERC20 tranferFrom selector constant | Remco Bloemen | 2018-06-27 | 1 | -4/+3 |
| | | | | |||||
| | * | | Optimize ERC20 transferFrom | Remco Bloemen | 2018-06-27 | 1 | -2/+126 |
| | | | | |||||
| * | | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
| | | | | |||||
| * | | | Fix tests | Fabio Berger | 2018-06-27 | 1 | -3/+6 |
| | | | | |||||
| * | | | Fix type issue | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 11 | -87/+91 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refactor/check-revert-reasons: Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` Expect RevertReason be passed in, not string Rename RevertReasons to RevertReason since singular enum names are more common # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts | ||||
| | * | | Temporarily switch revert reasons to `TransferFailed`. Should be ↵ | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` | ||||
| | * | | Expect RevertReason be passed in, not string | Fabio Berger | 2018-06-26 | 1 | -1/+5 |
| | | | | |||||
| | * | | Rename RevertReasons to RevertReason since singular enum names are more common | Fabio Berger | 2018-06-26 | 10 | -95/+95 |
| | | | | |||||
| | * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 33 | -266/+449 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts | ||||
| * | | | | Update AbstractAssetWrapper | Fabio Berger | 2018-06-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
| | | | | | |||||
| * | | | | Fix merge issues | Fabio Berger | 2018-06-26 | 5 | -17/+21 |
| | | | | | |||||
| * | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 33 | -281/+460 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts | ||||
| | * | | | Don't use variables for revert reasons | Amir Bandeali | 2018-06-26 | 14 | -86/+86 |
| | | | | | |||||
| | * | | | Add comments to dispatchTransferFrom | Amir Bandeali | 2018-06-26 | 1 | -30/+56 |
| | | | | | |||||
| | * | | | Document IAssetData | Remco Bloemen | 2018-06-26 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Compute bytes4 proxyid constants | Remco Bloemen | 2018-06-26 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Return inplace bytes in LibBytes.readBytesWithLength | Remco Bloemen | 2018-06-26 | 1 | -9/+7 |
| | | | | | |||||
| | * | | | Add Greg's documentation to MixinErc721Transfer | Remco Bloemen | 2018-06-26 | 1 | -33/+44 |
| | | | | | |||||
| | * | | | Add Greg's documentation to MixinErc20Transfer | Remco Bloemen | 2018-06-26 | 1 | -13/+35 |
| | | | | | |||||
| | * | | | Gas golf the transfer success logic | Remco Bloemen | 2018-06-26 | 1 | -11/+10 |
| | | | | | |||||
| | * | | | Optimize like in PR #767 | Remco Bloemen | 2018-06-26 | 3 | -34/+157 |
| | | | | | |||||
| | * | | | Run prettier and fix linting errors | Amir Bandeali | 2018-06-26 | 1 | -18/+6 |
| | | | | | |||||
| | * | | | Fix tests | Amir Bandeali | 2018-06-26 | 5 | -21/+4 |
| | | | | | |||||
| | * | | | Update tests | Remco Bloemen | 2018-06-26 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Update tests | Remco Bloemen | 2018-06-26 | 2 | -33/+20 |
| | | | | | |||||
| | * | | | Fix ERC721Proxy TokenId | Remco Bloemen | 2018-06-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add IAssetData | Remco Bloemen | 2018-06-26 | 2 | -1/+2 |
| | | | | | |||||
| | * | | | WIP | Remco Bloemen | 2018-06-26 | 3 | -2/+3 |
| | | | | | |||||
 |
index : dexon-sol-tools | |
| DEXON fork of Solidity development tools originated from 0x-monorepo (https://github.com/dexon-foundation/sol-tools) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |