Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update some tests after rebase | Alex Browne | 2018-06-07 | 3 | -20/+29 |
| | |||||
* | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 6 | -20/+135 |
| | |||||
* | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 12 | -170/+143 |
| | | | | expectRevertOrAlwaysFailingTransaction | ||||
* | Update code after rebase | Alex Browne | 2018-06-07 | 3 | -3/+8 |
| | |||||
* | Use Geth for contract tests | Alex Browne | 2018-06-07 | 1 | -0/+20 |
| | |||||
* | Stop running prettier on generated files | Leonid Logvinov | 2018-06-07 | 1 | -2/+1 |
| | |||||
* | Merge v2-prototype | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
|\ | |||||
| * | Replace `-` with `_` in yarn script name so that we are consistent across ↵ | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | | yarn script names | ||||
* | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵ | Fabio Berger | 2018-06-05 | 1 | -3/+3 |
|/ | | | | | | | running watch from root dir, with sub-package dir - stop using special prebuild script name and run pre_build steps for `watch` and `build` commands - Remove `clean` step from `build`/`watch` | ||||
* | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-tests | Alex Browne | 2018-06-05 | 1 | -1/+2 |
|\ | | | | | Don't automatically rebuild when running yarn test | ||||
| * | Don't automatically rebuild when running yarn test | Alex Browne | 2018-06-05 | 1 | -1/+2 |
| | | |||||
* | | rename GT to GREATER_THAN | Jacob Evans | 2018-06-05 | 3 | -3/+3 |
| | | |||||
* | | Rebase from v2-prototype | Jacob Evans | 2018-06-05 | 2 | -38/+2 |
| | | |||||
* | | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 30 | -702/+491 |
|/ | | | | failures, and remove redundant logic in matchOrders | ||||
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -55/+52 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Set contract expiration time to a constant 10 minutes Remove unused promises array Make erc20_wrapper and erc721_wrapper serial Rename changelogs to changelog Add CHANGELOG entry Check that git branch is up to date before publishing Move prepublish checks before building packages for publishing Refactor changelog utils to a separate module | ||||
| * | Set contract expiration time to a constant 10 minutes | Alex Browne | 2018-06-02 | 1 | -1/+2 |
| | | |||||
| * | Remove unused promises array | Alex Browne | 2018-06-02 | 2 | -6/+0 |
| | | |||||
| * | Make erc20_wrapper and erc721_wrapper serial | Alex Browne | 2018-06-02 | 2 | -48/+50 |
| | | |||||
* | | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | | |||||
* | | Fix tslint issues | Fabio Berger | 2018-06-02 | 3 | -5/+3 |
| | | |||||
* | | Fix types version | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 19 | -42/+91 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (33 commits) Only show ProviderDisplay in portal Improve sol-cov docs Remove old parse code Refactor order parser and add shared order support to new portal Add generate and fill order routes Address feedback Override ethereumjs-tx version Fix missing key Update placeholder param ordering Change userEtherBalanceInWei to optional so we can know if its loading Add loading state to ProviderDisplay Tweaks Add Placeholder component Add StandardIconRow Split render into loading and loaaded Fix linter errors Fix linter errors Add ethereum-types to extraFileIncludes Introduce ethereum-types package Remove merge conflicts from yarn.lock ... # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/src/utils/match_order_tester.ts # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/core.ts # packages/contracts/test/exchange/match_orders.ts # packages/contracts/test/libraries/lib_bytes.ts # packages/sol-cov/package.json | ||||
| * | Fix linter errors | Leonid Logvinov | 2018-06-01 | 6 | -6/+6 |
| | | |||||
| * | Add ethereum-types to extraFileIncludes | Leonid Logvinov | 2018-06-01 | 1 | -2/+9 |
| | | |||||
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 15 | -20/+20 |
| | | |||||
| * | Merge pull request #641 from 0xProject/feature/remove-types | Leonid Logvinov | 2018-06-01 | 1 | -0/+2 |
| |\ | | | | | | | Remove types | ||||
| | * | Remove some types | Leonid Logvinov | 2018-06-01 | 1 | -0/+2 |
| | | | |||||
| * | | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 5 | -25/+64 |
| |\ | | | | | | | Add awaitTransactionSuccess where needed | ||||
| | * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 2 | -5/+7 |
| | | | |||||
| | * | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 4 | -22/+59 |
| | | | |||||
* | | | fix method rename | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Rename Ecrecover to EthSign | Fabio Berger | 2018-06-01 | 3 | -6/+3 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 42 | -188/+717 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (45 commits) Check length before accessing indices, add awaitTransactionSuccess where needed, and rename function Add back before/after snapshots for each test Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT Make preSigned and allowedValidators mappings public Change names of signature types Fix formatting and tests Make AssetProxyId last byte of assetData Add signer to txHash, allow approveValidator to be used with executeTransaction Update Whitelist Fix Exchange interface Increase block gas limit Use last byte of signature as signature type Remove TxOrigin signature type, modify whitelist to use Validator signature type Update Whitelist contract with comments, also require maker to be whitelisted Fix build Add example whitelist contract and minimum tests Add sample whitelist contract Add TxOrigin signature type and rearrange order of types Add approveValidator function Add Validator signature type ... # Conflicts: # packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/transactions.ts # packages/order-utils/src/asset_proxy_utils.ts | ||||
| * | | Check length before accessing indices, add awaitTransactionSuccess where ↵ | Amir Bandeali | 2018-05-31 | 5 | -25/+43 |
| | | | | | | | | | | | | needed, and rename function | ||||
| * | | Add back before/after snapshots for each test | Amir Bandeali | 2018-05-31 | 16 | -0/+97 |
| | | | |||||
| * | | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT | Amir Bandeali | 2018-05-31 | 3 | -4/+4 |
| | | | |||||
| * | | Make preSigned and allowedValidators mappings public | Amir Bandeali | 2018-05-31 | 1 | -2/+2 |
| | | | |||||
| * | | Change names of signature types | Amir Bandeali | 2018-05-31 | 2 | -6/+6 |
| | | | |||||
| * | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 18 | -94/+16 |
| | | | |||||
| * | | Make AssetProxyId last byte of assetData | Amir Bandeali | 2018-05-31 | 18 | -37/+74 |
| | | | |||||
| * | | Add signer to txHash, allow approveValidator to be used with executeTransaction | Amir Bandeali | 2018-05-31 | 3 | -7/+10 |
| | | | |||||
| * | | Update Whitelist | Amir Bandeali | 2018-05-31 | 6 | -24/+55 |
| | | | |||||
| * | | Fix Exchange interface | Amir Bandeali | 2018-05-31 | 1 | -7/+5 |
| | | | |||||
| * | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 8 | -106/+103 |
| | | | |||||
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 7 | -35/+35 |
| | | | |||||
| * | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 5 | -16/+72 |
| | | | |||||
| * | | Fix build | Amir Bandeali | 2018-05-31 | 3 | -19/+24 |
| | | | |||||
| * | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 3 | -11/+121 |
| | | | |||||
| * | | Add sample whitelist contract | Amir Bandeali | 2018-05-31 | 3 | -1/+60 |
| | | | |||||
| * | | Add TxOrigin signature type and rearrange order of types | Amir Bandeali | 2018-05-31 | 3 | -63/+77 |
| | | | |||||
| * | | Add approveValidator function | Amir Bandeali | 2018-05-31 | 2 | -2/+17 |
| | | | |||||
| * | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 4 | -3/+69 |
| | | | |||||
| * | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 3 | -0/+92 |
| | | | |||||
| * | | Change logDecoder back into class, remove awaitTransactionMined from ↵ | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
| |/ | | | | | | | multiSigWrapper | ||||
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵ | Fabio Berger | 2018-05-31 | 4 | -32/+28 |
| | | | | | | | | the smart contracts | ||||
* | | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 20 | -382/+64 |
| | | | | | | | | package. | ||||
* | | Freeze order-utils at 0.0.5 for all packages except contracts | Fabio Berger | 2018-05-30 | 1 | -1/+1 |
|/ | |||||
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 5 | -103/+86 |
| | |||||
* | Fix imports in order_utils | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
| | |||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 20 | -387/+629 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 7 | -49/+48 |
| | | |||||
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 4 | -6/+12 |
| | | |||||
| * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 5 | -39/+53 |
| | | |||||
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 7 | -16/+16 |
| | | |||||
| * | Fix build | Amir Bandeali | 2018-05-25 | 4 | -4/+91 |
| | | |||||
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 6 | -33/+37 |
| | | |||||
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 4 | -253/+355 |
| | | |||||
| * | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a ↵ | Amir Bandeali | 2018-05-25 | 1 | -18/+48 |
| | | | | | | | | mapping of registered proxies | ||||
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 12 | -48/+26 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Temporarily disable installation tests Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2 # Conflicts: # packages/contracts/src/utils/order_utils.ts | ||||
| * \ | Merge pull request #618 from 0xProject/feature/v2-migrations | Leonid Logvinov | 2018-05-25 | 12 | -49/+27 |
| |\ \ | | |/ | |/| | Migrate migrations, types to v2 | ||||
| | * | Fix linter issues | Leonid Logvinov | 2018-05-25 | 3 | -3/+3 |
| | | | |||||
| | * | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 12 | -49/+27 |
| | | | |||||
* | | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 4 | -8/+41 |
| | | | |||||
* | | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 2 | -2/+2 |
| | | | |||||
* | | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 4 | -34/+57 |
|/ / | |||||
* / | Disable contracts coverage on CI | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
|/ | |||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 12 | -61/+85 |
| | |||||
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 5 | -19/+19 |
| | |||||
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 23 | -293/+280 |
|\ | |||||
| * | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | | |||||
| * | fix contract-wrappers version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | merge v2-prototype | Fabio Berger | 2018-05-23 | 1 | -11/+11 |
| |\ | |||||
| | * | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| | |\ | |||||
| | | * | Publish | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33 | ||||
| * | | | Fix dep version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix await calls | Fabio Berger | 2018-05-23 | 1 | -12/+3 |
| | | | | |||||
| * | | | Refactor etherToken test to use contract-wrappers | Fabio Berger | 2018-05-23 | 1 | -22/+36 |
| | | | | |||||
| * | | | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 6 | -14/+10 |
| | | | | |||||
| * | | | Fix imports | Fabio Berger | 2018-05-23 | 2 | -2/+1 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 23 | -207/+478 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts | ||||
| * | | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 23 | -266/+235 |
| | | | | |||||
* | | | | Parse compiler.json in SolCompilerArtifactsAdapter | Leonid Logvinov | 2018-05-23 | 1 | -3/+1 |
| | | | | |||||
* | | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 2 | -4/+5 |
| | | | | |||||
* | | | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33 | ||||
* | | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapter | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
| | | | | |||||
* | | | | Assign then return | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | Introduce CONFIG_FILE | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 4 | -4/+35 |
| |/ / |/| | | |||||
* | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 16 | -175/+419 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests | ||||
| * \ \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 16 | -175/+419 |
| |\ \ \ | | | | | | | | | | | Contracts test fixes | ||||
| | * | | | Rename some variables in multi_sig_with_time_lock.ts | Alex Browne | 2018-05-23 | 1 | -10/+10 |
| | | | | | |||||
| | * | | | Remove extra awaitTransactionMinedAsync calls | Alex Browne | 2018-05-23 | 1 | -4/+2 |
| | | | | | |||||
| | * | | | Apply changes to test/exchange/match_orders.ts | Alex Browne | 2018-05-22 | 1 | -6/+18 |
| | | | | | |||||
| | * | | | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 2 | -4/+8 |
| | | | | | |||||
| | * | | | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 10 | -155/+294 |
| | | | | | |||||
| | * | | | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 14 | -0/+91 |
| | | | | | |||||
* | | | | | Fix tslint issues | Fabio Berger | 2018-05-23 | 2 | -10/+13 |
|/ / / / | |||||
* | | | | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 7 | -18/+30 |
|\ \ \ \ | |_|/ / |/| | | | Fix build/lint errors and warnings | ||||
| * | | | Add CancelOrder and MatchOrder types | Remco Bloemen | 2018-05-22 | 2 | -3/+15 |
| | | | | |||||
| * | | | Add missing return types | Remco Bloemen | 2018-05-22 | 5 | -15/+15 |
| |/ / | |||||
* | | | merge development | Fabio Berger | 2018-05-23 | 3 | -5/+8 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 4 | -9/+12 |
| |\ | | | | | | | Add more tslint rules | ||||
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json | ||||
| | * | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 4 | -9/+12 |
| | | | | |||||
* | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 62 | -243/+2500 |
|\ \ \ \ | | | | | | | | | | | Atomic Order Matching | ||||
| * | | | | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -1/+16 |
| | | | | | |||||
| * | | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 7 | -41/+41 |
| | | | | | |||||
| * | | | | Style improvements to order matching | Greg Hysen | 2018-05-19 | 4 | -28/+17 |
| | | | | | |||||
| * | | | | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 53 | -57/+57 |
| | | | | | |||||
| * | | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 6 | -13/+16 |
| | | | | | |||||
| * | | | | Changed calculateFillResults to public visibility so that it can be used by ↵ | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| | | | | | | | | | | | | | | | | | | | | the Forwarding Contract. | ||||
| * | | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵ | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| | | | | | | | | | | | | | | | | | | | | we dont need to pass it in on each call. | ||||
| * | | | | Wording of calculateMatchedFillResults | Greg Hysen | 2018-05-19 | 1 | -9/+11 |
| | | | | | |||||
| * | | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵ | Greg Hysen | 2018-05-19 | 3 | -17/+63 |
| | | | | | | | | | | | | | | | | | | | | should be useful for the forwarding contract code. | ||||
| * | | | | Style improvements to the match orders typescript test class | Greg Hysen | 2018-05-19 | 1 | -18/+14 |
| | | | | | |||||
| * | | | | Removed redundant log decode call | Greg Hysen | 2018-05-19 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 8 | -141/+98 |
| | | | | | |||||
| * | | | | Updated order of settleMatchedOrders to align with settleOrder | Greg Hysen | 2018-05-19 | 3 | -8/+8 |
| | | | | | |||||
| * | | | | IExchange inherits from all other interfaces (in the same order as Exchange ↵ | Greg Hysen | 2018-05-19 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | inherits Mixins) | ||||
| * | | | | Renamed takerAssetFilledAmount to orderFilledAmount to more easily ↵ | Greg Hysen | 2018-05-19 | 3 | -37/+37 |
| | | | | | | | | | | | | | | | | | | | | distinguish between fill results and order state | ||||
| * | | | | Comments for readability in exchange core and mixin match orders | Greg Hysen | 2018-05-19 | 5 | -4/+11 |
| | | | | | |||||
| * | | | | Renamed "validate" functions to "assert" in mixin match. | Greg Hysen | 2018-05-19 | 5 | -21/+21 |
| | | | | | |||||
| * | | | | Throw if the left or right orders do not compute the correct fill results. I ↵ | Greg Hysen | 2018-05-19 | 5 | -37/+27 |
| | | | | | | | | | | | | | | | | | | | | like this better than just logging an error and failing silently. | ||||
| * | | | | Removed redundant status checks in matchOrders. Saves gas, plus follows ↵ | Greg Hysen | 2018-05-19 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | pattern of fillOrder more closely. | ||||
| * | | | | Token -> Asset in fillOrder spec | Greg Hysen | 2018-05-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Reordered functions in mixin exchange core -- getOrderInfo is at the bottom | Greg Hysen | 2018-05-19 | 2 | -77/+77 |
| | | | | | |||||
| * | | | | Changes based on style guidelines put out by Amir | Greg Hysen | 2018-05-19 | 9 | -172/+210 |
| | | | | | |||||
| * | | | | Reordered fund transfers for matched orders, plus added an extra sanity ↵ | Greg Hysen | 2018-05-19 | 3 | -35/+49 |
| | | | | | | | | | | | | | | | | | | | | check to order matching calculations | ||||
| * | | | | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 11 | -306/+288 |
| | | | | | |||||
| * | | | | Added require reasons to MixinMatchOrders and cleaned up some comments. | Greg Hysen | 2018-05-19 | 6 | -40/+75 |
| | | | | | |||||
| * | | | | Updated remaining contracts to v0.4.23 | Greg Hysen | 2018-05-19 | 4 | -4/+4 |
| | | | | | |||||
| * | | | | Removed isRoundingError from mixin header | Greg Hysen | 2018-05-19 | 1 | -10/+1 |
| | | | | | |||||
| * | | | | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 8 | -23/+1390 |
| | | | | | |||||
| * | | | | Atomic Order Matching - Smart Contracts. | Greg Hysen | 2018-05-19 | 13 | -114/+957 |
| | | | | | |||||
* | | | | | merge development | Fabio Berger | 2018-05-22 | 11 | -2/+12 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 13 | -1/+14 |
| | |/ | |/| | |||||
* | | | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-pad | Jacob Evans | 2018-05-18 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | ERC721Proxy Pad to 32 if asset ids are small | ||||
| * | | | Pad to 32 if asset ids are small | Jacob Evans | 2018-05-10 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 6 | -30/+19 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Do not remove artifacts when running `clean` fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Revert to lerna:run lint Do lint sequentially Exclude monorepo-scripts from tslint as test Fix prettier Add hover state to top tokens Change to weekly txn volume Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json Apply prettier to some files which were not formatted correctly Fix TSLint issues Fix TSLint issues Update ethereeumjs-testrpc to ganache-cli Fix infinite loop Add changelog entries for packages where executable binary exporting fixed ... # Conflicts: # packages/contracts/package.json # packages/contracts/util/formatters.ts # packages/contracts/util/signed_order_utils.ts # packages/migrations/package.json # yarn.lock | ||||
| * | | | Merge pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 1 | -0/+3 |
| |\ \ \ | | |_|/ | |/| | | Document Node.js version requirement and add it to package.json | ||||
| | * | | Change minimum Node version to 6.12 | Alex Browne | 2018-05-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Document Node.js version requirement and add it to package.json | Alex Browne | 2018-05-15 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix sol-compiler binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix abi-gen binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 1 | -1/+2 |
| | | | | |||||
| * | | | Move from using lerna multi-package commands to wsrun, update README's ↵ | Fabio Berger | 2018-05-15 | 2 | -16/+4 |
| |/ / | | | | | | | | | | accordingly | ||||
| * | | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 6 | -13/+22 |
| | | | |||||
* | | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 29 | -345/+394 |
|\| | | |/ |/| | |||||
| * | Revert "Remove gitkeeps" | Fabio Berger | 2018-05-12 | 1 | -0/+0 |
| | | | | | | | | This reverts commit 3f6876c4199353b597e1b0ebcf3907d6b8cce284. | ||||
| * | Remove gitkeeps | Fabio Berger | 2018-05-11 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 17 | -170/+303 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json | ||||
| | * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 12 | -12/+12 |
| | | | |||||
| | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 13 | -50/+50 |
| | | | |||||
| | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 13 | -51/+56 |
| | | | |||||
| | * | Rename deployer to sol-compiler | Leonid Logvinov | 2018-05-10 | 2 | -3/+3 |
| | | | |||||
| | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 17 | -176/+303 |
| | | | |||||
| * | | Add artifacts to clean command | Fabio Berger | 2018-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | Commit v1 artifacts to migrations package and remove compile step from prebuild | Fabio Berger | 2018-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | Fix tslint errors | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 6 | -36/+51 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (38 commits) Add fallback image support to relayer grid tile Clear relayer grid state when fetching Configure the compiler to generate artifacts with deployedBytecode Implement loading and error state for relayer grid Fallback image for relayer grid tile Change relayer grid tile to link on header Display top tokens from backend Remove overflowZ property from portal Suggestions and fix bad merge Fix typo Only show untracked tokens Make wallet scrollable Add token flow Update The Ocean logo Fix artifacts paths Create an artifacts folder Introduce a var Add removeHexPrefix util method CHeck if ABI exists Improve the readability of the check for should compile ... # Conflicts: # .gitignore # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts | ||||
| | * | Fix artifacts paths | Leonid Logvinov | 2018-05-07 | 1 | -2/+2 |
| | | | |||||
| | * | Move artifacts from src/artifacts to artifacts/v1 | Leonid Logvinov | 2018-05-07 | 1 | -1/+1 |
| | | | |||||
| | * | Implement new artifacts format | Leonid Logvinov | 2018-05-07 | 6 | -35/+50 |
| | | | |||||
| * | | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵ | Fabio Berger | 2018-05-10 | 5 | -27/+28 |
| |/ | | | | | | | unifying library with the same interface | ||||
| * | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1 | Leonid Logvinov | 2018-05-05 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.2 - @0xproject/abi-gen@0.2.13 - @0xproject/assert@0.2.9 - @0xproject/base-contract@0.3.1 - @0xproject/connect@0.6.12 - contracts@2.1.28 - @0xproject/deployer@0.4.3 - @0xproject/dev-utils@0.4.1 - @0xproject/json-schemas@0.7.23 - @0xproject/metacoin@0.0.6 - @0xproject/migrations@0.0.5 - @0xproject/order-utils@0.0.4 - @0xproject/react-docs-example@0.0.11 - @0xproject/react-docs@0.0.11 - @0xproject/react-shared@0.1.6 - @0xproject/sol-cov@0.0.10 - @0xproject/sol-resolver@0.0.4 - @0xproject/sra-report@0.0.14 - @0xproject/subproviders@0.10.1 - @0xproject/testnet-faucets@1.0.29 - @0xproject/types@0.6.3 - @0xproject/typescript-typings@0.3.1 - @0xproject/utils@0.6.1 - @0xproject/web3-wrapper@0.6.3 - @0xproject/website@0.0.32 | ||||
| * | Publishcontracts@2.1.27@0xproject/website@0.0.30@0xproject/testnet-faucets@1.0.28@0xproject/sra-report@0.0.13 | Leonid Logvinov | 2018-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | - 0x.js@0.37.1 - contracts@2.1.27 - @0xproject/order-utils@0.0.3 - @0xproject/sra-report@0.0.13 - @0xproject/testnet-faucets@1.0.28 - @0xproject/website@0.0.30 | ||||
| * | Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0 | Leonid Logvinov | 2018-05-04 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.0 - @0xproject/abi-gen@0.2.12 - @0xproject/assert@0.2.8 - @0xproject/base-contract@0.3.0 - @0xproject/connect@0.6.11 - contracts@2.1.26 - @0xproject/deployer@0.4.2 - @0xproject/dev-utils@0.4.0 - @0xproject/json-schemas@0.7.22 - @0xproject/metacoin@0.0.5 - @0xproject/migrations@0.0.4 - @0xproject/monorepo-scripts@0.1.19 - @0xproject/order-utils@0.0.2 - @0xproject/react-docs-example@0.0.9 - @0xproject/react-docs@0.0.9 - @0xproject/react-shared@0.1.4 - @0xproject/sol-cov@0.0.9 - @0xproject/sol-resolver@0.0.3 - @0xproject/sra-report@0.0.12 - @0xproject/subproviders@0.10.0 - @0xproject/testnet-faucets@1.0.27 - @0xproject/tslint-config@0.4.17 - @0xproject/types@0.6.2 - @0xproject/typescript-typings@0.3.0 - @0xproject/utils@0.6.0 - @0xproject/web3-wrapper@0.6.2 - @0xproject/website@0.0.29 | ||||
* | | Add revert variables, change lib => libs to get around gitignore | Amir Bandeali | 2018-05-09 | 21 | -52/+325 |
| | | |||||
* | | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 10 | -63/+97 |
| | | |||||
* | | Split up mixins and interfaces | Amir Bandeali | 2018-05-05 | 29 | -745/+508 |
| | | |||||
* | | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 5 | -33/+180 |
| | | |||||
* | | Update contracts with revert reasons and constructor keyword | Amir Bandeali | 2018-05-03 | 42 | -181/+410 |
| | | |||||
* | | Add MixinAssetProxy to reuse redundant code | Amir Bandeali | 2018-05-03 | 4 | -98/+117 |
| | | |||||
* | | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
| | | |||||
* | | Add batchTransferFrom to asset proxies | Amir Bandeali | 2018-05-02 | 3 | -9/+111 |
| | | |||||
* | | Remove outdated comment | Amir Bandeali | 2018-05-01 | 2 | -4/+2 |
| | | |||||
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 6 | -5/+76 |
| | | |||||
* | | Move TokenRegistry to 'previous' directory | Amir Bandeali | 2018-04-27 | 2 | -2/+2 |
| | | |||||
* | | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 19 | -271/+448 |
| | | |||||
* | | Add LibFillResults | Amir Bandeali | 2018-04-27 | 11 | -78/+107 |
| | | |||||
* | | Add ERC721 contracts from zeppelin-solidity | Amir Bandeali | 2018-04-27 | 6 | -4/+574 |
| | | |||||
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 5 | -31/+50 |
| | | |||||
* | | Add tests | Amir Bandeali | 2018-04-27 | 1 | -4/+38 |
| | | |||||
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 7 | -1/+226 |
| | | |||||
* | | Implement sender abstraction | Amir Bandeali | 2018-04-27 | 6 | -47/+210 |
| | | |||||
* | | Fix prettier | Fabio Berger | 2018-04-25 | 1 | -3/+9 |
| | | |||||
* | | Fix merge conflict issues | Fabio Berger | 2018-04-24 | 2 | -2/+0 |
| | | |||||
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 8 | -285/+309 |
|\ \ | |||||
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 8 | -286/+308 |
| | | | |||||
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 10 | -181/+116 |
| | | | |||||
* | | | Combine Exchange with AssetProxyDispatcher | Amir Bandeali | 2018-04-24 | 7 | -67/+58 |
|/ / | |||||
* | | Define numbers of dummy tokens to deploy in constants | Amir Bandeali | 2018-04-24 | 3 | -2/+4 |
| | | |||||
* | | Remove type assertions | Amir Bandeali | 2018-04-24 | 1 | -18/+12 |
| | | |||||
* | | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 8 | -673/+587 |
| | | |||||
* | | Add ERC721 wrapper | Amir Bandeali | 2018-04-24 | 2 | -20/+161 |
| | | |||||
* | | Add ERC20Wrapper | Amir Bandeali | 2018-04-24 | 3 | -32/+127 |
| | | |||||
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 6 | -57/+57 |
| | | |||||
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 7 | -274/+274 |
| | | |||||
* | | Reorder event args | Amir Bandeali | 2018-04-22 | 1 | -10/+10 |
| | | |||||
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 2 | -12/+12 |
| | | |||||
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 15 | -656/+656 |
| | | |||||
* | | Rename Token => IERC20Token | Amir Bandeali | 2018-04-22 | 8 | -156/+48 |
| | | |||||
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 14 | -108/+61 |
| | | |||||
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 6 | -85/+83 |
| | | |||||
* | | Fix names and visibilities, use address type over contract type for function ↵ | Amir Bandeali | 2018-04-22 | 5 | -22/+21 |
| | | | | | | | | args and returns | ||||
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 5 | -34/+18 |
| | | |||||
* | | Add presigned signature type | Amir Bandeali | 2018-04-21 | 1 | -1/+29 |
| | | |||||
* | | Fix zeppelin imports, run prettier | Amir Bandeali | 2018-04-21 | 3 | -4/+3 |
| | | |||||
* | | Added tests for (most functions in) LibBytes. The write methods are not ↵ | Greg Hysen | 2018-04-21 | 3 | -2/+241 |
| | | | | | | | | currently compatible with our generated contract wrappers. | ||||
* | | Added description for the DummyERC721Token constructor | Greg Hysen | 2018-04-21 | 1 | -0/+6 |
| | | |||||
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵ | Greg Hysen | 2018-04-21 | 6 | -29/+33 |
| | | | | | | | | confusion. Also updated the function description. | ||||
* | | Reverting earlier change: interfaces now inherit from other interfaces | Greg Hysen | 2018-04-21 | 2 | -2/+10 |
| | | |||||
* | | Clarified that 0x0 could be passed into AssetProxyDispatcher | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | | |||||
* | | Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵ | Greg Hysen | 2018-04-21 | 3 | -132/+5 |
| | | | | | | | | exists in Typescript). This simplifies the code. | ||||
* | | Added @TODO for safeTransferFrom support in ERC721 proxy | Greg Hysen | 2018-04-21 | 1 | -0/+2 |
| | | |||||
* | | Removed outdated TODO comment in MixinSettlementProxy | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | | |||||
* | | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 8 | -23/+38 |
| | | |||||
* | | Ran prettier | Greg Hysen | 2018-04-21 | 4 | -58/+15 |
| | | |||||
* | | renaming after tokenTransferProxy was removed | Greg Hysen | 2018-04-21 | 4 | -127/+127 |
| | | |||||
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 17 | -631/+82 |
| | | |||||
* | | Updated commenting. Noted that transferFrom succeeds or throws on all ↵ | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
| | | | | | | | | transferFrom implementations. | ||||
* | | switched to constants in default order params. | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | | |||||
* | | Reverted change that allowed ERC721 transfer proxy to be called with amount ↵ | Greg Hysen | 2018-04-21 | 2 | -14/+10 |
| | | | | | | | | 0. This now throws. | ||||
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 10 | -239/+237 |
| | | |||||
* | | Added clarity to not-authorized test case in dispatcher | Greg Hysen | 2018-04-21 | 1 | -3/+4 |
| | | |||||
* | | toUnsigned -> toBuffer in assetProxyUtils | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves ↵ | Greg Hysen | 2018-04-21 | 1 | -5/+17 |
| | | | | | | | | 900 gas | ||||
* | | address -> IAssetProxy where possible for clarity | Greg Hysen | 2018-04-21 | 2 | -13/+13 |
| | | |||||
* | | Reverted to calling read/write uint256 | Greg Hysen | 2018-04-21 | 2 | -2/+28 |
| | | |||||
* | | More testing of common functionality across proxies | Greg Hysen | 2018-04-21 | 1 | -19/+58 |
| | | |||||
* | | Updates to proxy tests. | Greg Hysen | 2018-04-21 | 1 | -13/+13 |
| | | |||||
* | | More authorized -> owner in test comments | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Removed unnecessary deployments in test | Greg Hysen | 2018-04-21 | 1 | -17/+1 |
| | | |||||
* | | Moved ERC721 FillOrderNoThrow tests into wrapper | Greg Hysen | 2018-04-21 | 2 | -45/+60 |
| | | |||||
* | | Style improvements to the Asset Proxy tests | Greg Hysen | 2018-04-21 | 2 | -134/+140 |
| | | |||||
* | | Replaced instances of `accounts[0]` with `owner` in contracts test cases | Greg Hysen | 2018-04-21 | 5 | -23/+26 |
| | | |||||
* | | Minor changes to typescript tests | Greg Hysen | 2018-04-21 | 3 | -8/+6 |
| | | |||||
* | | Minor fixes to the contracts | Greg Hysen | 2018-04-21 | 3 | -2/+5 |
| | | |||||
* | | Rearranged preconditions in ERC721 proxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | |