Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 1 | -22/+30 |
| | |||||
* | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 4 | -6/+5 |
| | |||||
* | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
| | |||||
* | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -14/+6 |
| | |||||
* | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| | |||||
* | Style updates to contracts | Greg Hysen | 2018-06-08 | 3 | -10/+4 |
| | |||||
* | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| | |||||
* | Removed setting makerAssetData/takerAssetData from tests where values are ↵ | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| | | | | same as defaultOrderParams. | ||||
* | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 2 | -3/+14 |
| | |||||
* | Fixes after rebasing | Greg Hysen | 2018-06-08 | 3 | -8/+6 |
| | |||||
* | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 5 | -34/+21 |
| | |||||
* | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 2 | -27/+32 |
| | |||||
* | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 2 | -12/+14 |
| | |||||
* | Resolved edge case in Memcpy where where send would eventually turn ↵ | Greg Hysen | 2018-06-08 | 1 | -133/+137 |
| | | | | "negative" and wrap around. | ||||
* | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 1 | -5/+5 |
| | | | | 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 | 9 | -223/+190 |
| | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
* | proxyData -> assetData | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -29/+6 |
| | |||||
* | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 1 | -2/+40 |
| | |||||
* | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 |
| | |||||
* | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 3 | -18/+165 |
| | |||||
* | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 2 | -3/+121 |
| | |||||
* | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -26/+30 |
| | |||||
* | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 2 | -1/+73 |
| | |||||
* | Tests for libMem | Greg Hysen | 2018-06-08 | 1 | -0/+68 |
| | |||||
* | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
| | |||||
* | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| | |||||
* | Fix missing paths | Fabio Berger | 2018-06-08 | 1 | -4/+4 |
| | |||||
* | Fixed path | Fabio Berger | 2018-06-07 | 2 | -10/+10 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-06-07 | 16 | -290/+303 |
|\ | |||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 13 | -206/+263 |
| |\ | | | | | | | | | | feature/improve-linting | ||||
| | * | Apply prettier | Alex Browne | 2018-06-07 | 2 | -3/+10 |
| | | | |||||
| | * | Update contracts tests after rebase | Alex Browne | 2018-06-07 | 2 | -14/+14 |
| | | | |||||
| | * | Apply various fixes based on PR feedback | Alex Browne | 2018-06-07 | 2 | -11/+54 |
| | | | |||||
| | * | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 13 | -103/+103 |
| | | | |||||
| | * | Fix linter errors | Alex Browne | 2018-06-07 | 1 | -6/+2 |
| | | | |||||
| | * | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 2 | -16/+28 |
| | | | |||||
| | * | Small fixes and cleanup | Alex Browne | 2018-06-07 | 1 | -2/+2 |
| | | | |||||
| | * | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 2 | -146/+49 |
| | | | |||||
| | * | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 1 | -6/+4 |
| | | | |||||
| | * | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 3 | -55/+58 |
| | | | |||||
| | * | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 2 | -21/+15 |
| | | | |||||
| | * | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 1 | -24/+28 |
| | | | |||||
| | * | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| | | | |||||
| | * | 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 | 11 | -168/+141 |
| | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| | * | Update code after rebase | Alex Browne | 2018-06-07 | 1 | -20/+0 |
| | | | |||||
| | * | Use Geth for contract tests | Alex Browne | 2018-06-07 | 1 | -0/+20 |
| | | | |||||
| * | | Linter now passes | fragosti | 2018-06-06 | 16 | -70/+26 |
| |/ | |||||
* / | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 17 | -45/+45 |
|/ | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | 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 | 5 | -71/+70 |
| | | | | failures, and remove redundant logic in matchOrders | ||||
* | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | |||||
* | Fix tslint issues | Fabio Berger | 2018-06-02 | 2 | -3/+2 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 9 | -27/+63 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -2/+2 |
| | | |||||
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 6 | -6/+8 |
| | | |||||
| * | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 4 | -21/+54 |
| |\ | | | | | | | Add awaitTransactionSuccess where needed | ||||
| | * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 1 | -1/+1 |
| | | | |||||
| | * | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 3 | -20/+53 |
| | | | |||||
* | | | fix method rename | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 8 | -13/+185 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -13/+27 |
| | | | | | | | | | | | | needed, and rename function | ||||
| * | | Add back before/after snapshots for each test | Amir Bandeali | 2018-05-31 | 16 | -0/+97 |
| | | | |||||
| * | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 14 | -90/+6 |
| | | | |||||
| * | | Update Whitelist | Amir Bandeali | 2018-05-31 | 1 | -0/+1 |
| | | | |||||
| * | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 3 | -32/+28 |
| | | | |||||
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 2 | -4/+7 |
| | | | |||||
| * | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 1 | -4/+29 |
| | | | |||||
| * | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 1 | -2/+89 |
| | | | |||||
| * | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -1/+1 |
| | | | |||||
| * | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 1 | -0/+34 |
| |/ | |||||
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵ | Fabio Berger | 2018-05-31 | 1 | -6/+6 |
| | | | | | | | | the smart contracts | ||||
* | | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 9 | -65/+38 |
|/ | | | | package. | ||||
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 3 | -102/+85 |
| | |||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 5 | -319/+404 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 1 | -5/+4 |
| | | |||||
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 3 | -5/+11 |
| | | |||||
| * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 2 | -19/+11 |
| | | |||||
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 2 | -7/+7 |
| | | |||||
| * | Fix build | Amir Bandeali | 2018-05-25 | 1 | -2/+6 |
| | | |||||
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 1 | -17/+17 |
| | | |||||
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 3 | -228/+312 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 6 | -10/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Fix linter issues | Leonid Logvinov | 2018-05-25 | 2 | -2/+2 |
| | | | |||||
| * | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 6 | -10/+9 |
| |/ | |||||
* | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 1 | -2/+8 |
| | | |||||
* | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 1 | -0/+6 |
|/ | |||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 11 | -60/+84 |
| | |||||
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 4 | -379/+2 |
| | |||||
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 16 | -267/+251 |
|\ | |||||
| * | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | | |||||
| * | 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 | 5 | -11/+5 |
| | | |||||
| * | Fix imports | Fabio Berger | 2018-05-23 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 16 | -189/+447 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 16 | -240/+208 |
| | | | |||||
* | | | 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 | 1 | -3/+3 |
| | | | |||||
* | | | 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 | 2 | -1/+24 |
| |/ |/| | |||||
* | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 15 | -175/+418 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 15 | -175/+418 |
| |\ \ | | | | | | | | | 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 | 9 | -155/+293 |
| | | | | |||||
| | * | | 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 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix build/lint errors and warnings | ||||
| * | | Add missing return types | Remco Bloemen | 2018-05-22 | 1 | -1/+1 |
| |/ | |||||
* | | merge development | Fabio Berger | 2018-05-23 | 2 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 3 | -8/+8 |
| |\ | | | | | | | Add more tslint rules | ||||
| | * | Fix TSLint rules | Fabio Berger | 2018-05-16 | 3 | -8/+8 |
| | | | |||||
* | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 4 | -16/+1200 |
|\ \ \ | | | | | | | | | Atomic Order Matching | ||||
| * | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 1 | -12/+12 |
| | | | | |||||
| * | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 3 | -11/+13 |
| | | | | |||||
| * | | | 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. | ||||
| * | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵ | Greg Hysen | 2018-05-19 | 1 | -12/+10 |
| | | | | | | | | | | | | | | | | 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 |
| | | | | |||||
| * | | | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 1 | -64/+41 |
| | | | | |||||
| * | | | Throw if the left or right orders do not compute the correct fill results. I ↵ | Greg Hysen | 2018-05-19 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | like this better than just logging an error and failing silently. | ||||
| * | | | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 2 | -2/+1 |
| | | | | |||||
| * | | | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 4 | -17/+1243 |
| | | | | |||||
* | | | | merge development | Fabio Berger | 2018-05-22 | 10 | -1/+10 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 12 | -0/+12 |
| |/ | |||||
| * | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 19 | -267/+250 |
|\| | |||||
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 14 | -159/+285 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 12 | -49/+53 |
| | | | |||||
| | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 14 | -150/+271 |
| | | | |||||
| * | | Fix tslint errors | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 2 | -4/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | Implement new artifacts format | Leonid Logvinov | 2018-05-07 | 2 | -4/+3 |
| | | | |||||
| * | | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵ | Fabio Berger | 2018-05-10 | 4 | -7/+8 |
| |/ | | | | | | | unifying library with the same interface | ||||
* | | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 1 | -3/+3 |
| | | |||||
* | | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 1 | -22/+30 |
| | | |||||
* | | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
| | | |||||
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 2 | -0/+22 |
| | | |||||
* | | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 3 | -178/+248 |
| | | |||||
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 1 | -15/+25 |
| | | |||||
* | | Add tests | Amir Bandeali | 2018-04-27 | 1 | -4/+38 |
| | | |||||
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 1 | -0/+161 |
| | | |||||
* | | 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 | 5 | -188/+213 |
|\ \ | |||||
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 5 | -189/+212 |
| | | | |||||
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 6 | -175/+59 |
|/ / | |||||
* | | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 6 | -672/+574 |
| | | |||||
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 5 | -51/+51 |
| | | |||||
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 3 | -254/+254 |
| | | |||||
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -11/+11 |
| | | |||||
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 4 | -453/+453 |
| | | |||||
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 7 | -37/+37 |
| | | |||||
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 5 | -51/+51 |
| | | |||||
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 3 | -6/+3 |
| | | |||||
* | | Added tests for (most functions in) LibBytes. The write methods are not ↵ | Greg Hysen | 2018-04-21 | 1 | -0/+238 |
| | | | | | | | | currently compatible with our generated contract wrappers. | ||||
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵ | Greg Hysen | 2018-04-21 | 3 | -18/+18 |
| | | | | | | | | confusion. Also updated the function description. | ||||
* | | Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵ | Greg Hysen | 2018-04-21 | 1 | -60/+0 |
| | | | | | | | | exists in Typescript). This simplifies the code. | ||||
* | | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 5 | -19/+34 |
| | | |||||
* | | 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 | 7 | -333/+80 |
| | | |||||
* | | 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 | 1 | -11/+10 |
| | | | | | | | | 0. This now throws. | ||||
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 3 | -176/+159 |
| | | |||||
* | | Added clarity to not-authorized test case in dispatcher | Greg Hysen | 2018-04-21 | 1 | -3/+4 |
| | | |||||
* | | 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 | 1 | -4/+4 |
| | | |||||
* | | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 3 | -7/+7 |
| | | |||||
* | | Ran prettier/linter on new contract tests | Greg Hysen | 2018-04-21 | 3 | -4/+0 |
| | | |||||
* | | Added comments around deploying contracts to helper/wrapper tests | Greg Hysen | 2018-04-21 | 2 | -65/+34 |
| | | |||||
* | | TS styles in core contract tests | Greg Hysen | 2018-04-21 | 1 | -91/+38 |
| | | |||||
* | | Added more comments to proxy tests | Greg Hysen | 2018-04-21 | 1 | -52/+25 |
| | | |||||
* | | Cleaned up TS in dispatcher tests | Greg Hysen | 2018-04-21 | 1 | -44/+36 |
| | | |||||
* | | Removed some unused ERC721 tokens | Greg Hysen | 2018-04-21 | 1 | -62/+13 |
| | | |||||
* | | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 5 | -62/+62 |
| | | |||||
* | | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 3 | -28/+28 |
| | | |||||
* | | nilAddress to ZeroEx.NULL_ADDRESS | Greg Hysen | 2018-04-21 | 5 | -27/+22 |
| | | |||||
* | | Removed unnecessary assetProxyManagerAddress | Greg Hysen | 2018-04-21 | 5 | -29/+17 |
| | | |||||
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 4 | -21/+21 |
| | | |||||
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 4 | -11/+13 |
| | | |||||
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 5 | -48/+48 |
| | | |||||
* | | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 5 | -20/+1366 |
| | | |||||
* | | Add back require statements and tests (will move to another PR) | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
| | | |||||
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 3 | -303/+313 |
| | | |||||
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 2 | -20/+15 |
| | | |||||
* | | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 1 | -2/+172 |
| | | |||||
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 3 | -419/+355 |
| | | |||||
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 1 | -13/+21 |
| | | |||||
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 2 | -69/+4 |
| | | |||||
* | | updated test name to reflect smart contracts | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵ | Greg Hysen | 2018-04-21 | 1 | -23/+27 |
| | | | | | | | | orders with salt <= to maker epoch will be cancelled (previously, it was salt < maker epoch) | ||||
* | | Renamed all instances of timestamp to salt. Clarified test case wording. | Greg Hysen | 2018-04-21 | 1 | -15/+15 |
| | | |||||
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 1 | -51/+51 |
| | | |||||
* | | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 1 | -0/+67 |
| | | | | | | | | specific time | ||||
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 3 | -6/+6 |
| | | |||||
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 2 | -6/+3 |
| | | |||||
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 2 | -130/+302 |
| | | |||||
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -1/+0 |
| | | |||||
* | | Add fillOrderNoThrow to exchange wrapper and add test | Amir Bandeali | 2018-04-21 | 1 | -6/+48 |
| | | |||||
* | | Modify tests to work with new utils | Amir Bandeali | 2018-04-21 | 4 | -584/+632 |
| | | |||||
* | | Fix log decoding | Amir Bandeali | 2018-04-21 | 1 | -13/+13 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -13/+14 |
| | | |||||
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 2 | -10/+10 |
| | | |||||
* | | Move log decoding logic to exchange wrapper | Amir Bandeali | 2018-04-21 | 1 | -10/+9 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -124/+124 |
| | | |||||
* | | Move utils dir into src | Amir Bandeali | 2018-04-21 | 12 | -45/+40 |
| | | |||||
* | | Merge development | Amir Bandeali | 2018-04-21 | 1 | -10/+7 |
| | | |||||
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -11/+3 |
| | | |||||
* | | Get tests to build | Amir Bandeali | 2018-04-21 | 2 | -173/+150 |
|/ | |||||
* | Move NULL_BYTES to @0xproject/utils | Fabio Berger | 2018-04-11 | 1 | -3/+3 |
| | |||||
* | Simplify the tests | Fabio Berger | 2018-04-11 | 1 | -1/+1 |
| | |||||
* | Move migrations into separate monorepo subpackage and hook it up to 0x.js ↵ | Fabio Berger | 2018-04-09 | 1 | -1/+1 |
| | | | | and contracts | ||||
* | Move away from using web3 directly in 0x.js tests | Fabio Berger | 2018-04-06 | 1 | -3/+4 |
| | |||||
* | Merge branch 'development' into removeMigrateStep | Fabio Berger | 2018-04-05 | 14 | -55/+51 |
|\ | | | | | | | | | | | | | | | * development: Fix tests Call static functions as static Address feedback Move our contract templates to accept Provider instead of Web3Wrapper | ||||
| * | Fix tests | Leonid Logvinov | 2018-04-05 | 2 | -3/+1 |
| | | |||||
| * | Move our contract templates to accept Provider instead of Web3Wrapper | Leonid Logvinov | 2018-04-04 | 13 | -53/+51 |
| | | |||||
* | | Fix typos | Fabio Berger | 2018-04-04 | 1 | -2/+2 |
|/ | |||||
* | Properly and consistently parse ENV vars | Leonid Logvinov | 2018-03-13 | 1 | -2/+2 |
| | |||||
* | Make Deployer configurable by jsonrpcUrl instead of jsonrpcPort | Leonid Logvinov | 2018-03-12 | 1 | -1/+1 |
| | |||||
* | Add support for async calls under coverage | Leonid Logvinov | 2018-03-12 | 1 | -4/+8 |
| | |||||
* | Fix a typo in tests | Leonid Logvinov | 2018-03-12 | 1 | -2/+2 |
| | |||||
* | Don't do parallel calls | Leonid Logvinov | 2018-03-12 | 1 | -8/+4 |
| | |||||
* | Rename useInProcessGanache to shouldUseInProcessGanache | Leonid Logvinov | 2018-03-12 | 1 | -1/+1 |
| | |||||
* | Make coverage a module instead of a function | Leonid Logvinov | 2018-03-12 | 1 | -2/+2 |
| | |||||
* | Rename COVERAGE to SOLIDITY_COVERAGS | Leonid Logvinov | 2018-03-12 | 1 | -1/+1 |
| | |||||
* | Rename getCoverageSubprovider to getCoverageSubproviderSingleton | Leonid Logvinov | 2018-03-12 | 1 | -2/+2 |
| | |||||
* | Use in-process Ganache in contracts | Leonid Logvinov | 2018-03-12 | 1 | -1/+2 |
| |