aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/asset_proxy
Commit message (Collapse)AuthorAgeFilesLines
* Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ↵Fabio Berger2018-07-181-2/+3
| | | | them exported
* Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-171-15/+15
|
* Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-111-3/+3
|
* Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-051-8/+8
|
* Improve robustness of revert reason assertionsAlex Browne2018-07-032-17/+17
|
* Fix buildAmir Bandeali2018-06-301-0/+1
|
* Update file structureAmir Bandeali2018-06-302-20/+19
|
* Fix deployment to gethAmir Bandeali2018-06-301-6/+5
|
* Fix testsAmir Bandeali2018-06-301-71/+134
|
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-281-5/+8
| | | | as well as only deploy the number of ERC20 tokens needed for each test suite
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-273-208/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Add more revert reasons to testsAmir Bandeali2018-06-272-13/+12
| |
| * Remove redundant files, hard code function selector in dispatchTransferFrom, ↵Amir Bandeali2018-06-272-192/+0
| | | | | | | | and modify revert reason
* | Fix testsFabio Berger2018-06-271-3/+6
| |
* | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-272-14/+14
|\| | | | | | | | | | | | | | | | | | | | | * 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
| * Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-262-14/+14
| |
| * Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-262-50/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Rename to singularFabio Berger2018-06-261-9/+9
| | |
* | | Fix merge issuesFabio Berger2018-06-261-1/+4
| | |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-262-65/+38
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 reasonsAmir Bandeali2018-06-261-2/+4
| | |
| * | Run prettier and fix linting errorsAmir Bandeali2018-06-261-18/+6
| | |
| * | Fix testsAmir Bandeali2018-06-261-2/+1
| | |
| * | Update testsRemco Bloemen2018-06-261-2/+2
| | |
| * | Update testsRemco Bloemen2018-06-262-33/+20
| | |
| * | WIPRemco Bloemen2018-06-261-0/+1
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-252-2/+2
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-252-2/+2
| | |
| * | Add missing importFabio Berger2018-06-251-1/+4
| | |
* | | Add missing importFabio Berger2018-06-251-1/+4
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-252-16/+33
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-252-1/+69
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts
| * | Fix prettierFabio Berger2018-06-231-3/+1
| | |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-232-14/+14
| | |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-221-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ...
| * | | remove unused importFabio Berger2018-06-221-1/+0
| | | |
| * | | Test revert reasons in proxy testsFabio Berger2018-06-211-11/+23
| | | |
| * | | remove onlyFabio Berger2018-06-211-1/+1
| | | |
| * | | Check revert reasons in Authorizable testsFabio Berger2018-06-211-6/+14
| | | |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-252-2/+69
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (97 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/utils/constants.ts # packages/contracts/test/exchange/core.ts
| * | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-231-0/+69
| | | |
| * | | Merge LibMem and LibBytesRemco Bloemen2018-06-231-1/+0
| | |/ | |/|
| * | Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-221-1/+0
| |/
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-201-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (22 commits) Fix closing parens in liborder Update after rebase ERC721Proxy Always call safeTransferFrom Rename makerEpoch => orderEpoch Make cancelOrdersUpTo compatible with sender abstraction Update PR template Use Image component instead of img tag Assembler orderHash function Optimize and remove redundant encodePacked Fix linting issue Fix bug where we do fetch balances on wallet login Check network state immediately instead of waiting for delay Fix onboarding persisting when changing routes Consolidate account state messaging logic Only elevate wallet zIndex when onboarding is in progress Rebase and update feedback Run linter Add Portal v2 logging Simplified handling of source < 32 edge case Basic EIP712 encoder ...
| * ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-2/+6
| |
* | Remove hack in ERC20WrapperFabio Berger2018-06-191-1/+4
| |
* | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵Fabio Berger2018-06-151-1/+2
|/ | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens
* Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-132-40/+49
|
* Linter changes to contractsGreg Hysen2018-06-092-11/+3
|
* Cleanup after last rebaseGreg Hysen2018-06-082-3/+3
|
* Updated tests to use new revert handlerGreg Hysen2018-06-081-2/+2
|
* Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
|
* Style updates to contractsGreg Hysen2018-06-082-8/+3
|
* Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
|
* Style updates to ERC721 onReceiverGreg Hysen2018-06-082-3/+14
|
* Fixes after rebasingGreg Hysen2018-06-082-8/+5
|
* Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-28/+14
|
* Style audit for proxies + libmem + libbytesGreg Hysen2018-06-082-27/+32
|
* Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-081-11/+13
|
* Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-081-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 Hysen2018-06-082-95/+62
| | | | assetMetadata, proxyData, proxyMetadata to assetData
* Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-082-17/+45
|
* Test for onReceived erc721 callbackGreg Hysen2018-06-082-3/+121
|
* LibAssetProxyDecoder testsGreg Hysen2018-06-081-26/+30
|
* Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-081-0/+72
|
* Fix missing pathsFabio Berger2018-06-081-4/+4
|
* merge v2-prototypeFabio Berger2018-06-072-36/+31
|\
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-072-24/+26
| |\ | | | | | | | | | feature/improve-linting
| | * Add Async suffix to relevant assertionsAlex Browne2018-06-072-14/+14
| | |
| | * Replace constant.REVERT test assertions with ↵Alex Browne2018-06-072-24/+26
| | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | Linter now passesfragosti2018-06-062-8/+1
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-062-5/+5
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-051-0/+1
| | | | failures, and remove redundant logic in matchOrders
* Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-2/+2
| | | | package.
* Check transaction receipt status codes where applicableAlex Browne2018-05-242-16/+22
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-232-47/+101
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Fix some unhandled promise rejectionsAlex Browne2018-05-221-2/+2
| |
| * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-222-45/+87
| |
| * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-222-0/+12
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-9/+2
|/
* merge developmentFabio Berger2018-05-221-0/+1
|
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-162-12/+13
|
* Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-081-3/+3
|
* Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
|
* Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-011-0/+10
|
* merge v2-prototypeFabio Berger2018-04-241-18/+18
|
* Fix testsAmir Bandeali2018-04-242-0/+344
generated by cgit (git 2.34.1) at 2024-11-20 23:54:41 +0800