aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Collapse)AuthorAgeFilesLines
* Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-232-4/+5
|
* PublishLeonid Logvinov2018-05-231-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 SolCompilerArtifactAdapterLeonid Logvinov2018-05-231-2/+2
|
* Assign then returnLeonid Logvinov2018-05-231-1/+2
|
* Introduce CONFIG_FILELeonid Logvinov2018-05-231-1/+2
|
* Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-234-4/+35
|
* Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-2316-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-fixesAlex Browne2018-05-2316-175/+419
| |\ | | | | | | Contracts test fixes
| | * Rename some variables in multi_sig_with_time_lock.tsAlex Browne2018-05-231-10/+10
| | |
| | * Remove extra awaitTransactionMinedAsync callsAlex Browne2018-05-231-4/+2
| | |
| | * Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | |
| | * Fix some unhandled promise rejectionsAlex Browne2018-05-222-4/+8
| | |
| | * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-2210-155/+294
| | |
| | * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-2214-0/+91
| | |
* | | Fix tslint issuesFabio Berger2018-05-232-10/+13
|/ /
* | Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-237-18/+30
|\ \ | | | | | | Fix build/lint errors and warnings
| * | Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-222-3/+15
| | |
| * | Add missing return typesRemco Bloemen2018-05-225-15/+15
| |/
* | merge developmentFabio Berger2018-05-233-5/+8
|\ \ | |/ |/|
| * Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-234-9/+12
| |\ | | | | | | Add more tslint rules
| | * Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-161-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 rulesFabio Berger2018-05-164-9/+12
| | | |
* | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-2262-243/+2500
|\ \ \ \ | | | | | | | | | | Atomic Order Matching
| * | | | Added getNullFillResultsGreg Hysen2018-05-192-1/+16
| | | | |
| * | | | orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-197-41/+41
| | | | |
| * | | | Style improvements to order matchingGreg Hysen2018-05-194-28/+17
| | | | |
| * | | | Upgraded to Solidity 0.4.24Greg Hysen2018-05-1953-57/+57
| | | | |
| * | | | Rebased against v2-prototypeGreg Hysen2018-05-196-13/+16
| | | | |
| * | | | Changed calculateFillResults to public visibility so that it can be used by ↵Greg Hysen2018-05-193-131/+131
| | | | | | | | | | | | | | | | | | | | the Forwarding Contract.
| * | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵Greg Hysen2018-05-192-138/+126
| | | | | | | | | | | | | | | | | | | | we dont need to pass it in on each call.
| * | | | Wording of calculateMatchedFillResultsGreg Hysen2018-05-191-9/+11
| | | | |
| * | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵Greg Hysen2018-05-193-17/+63
| | | | | | | | | | | | | | | | | | | | should be useful for the forwarding contract code.
| * | | | Style improvements to the match orders typescript test classGreg Hysen2018-05-191-18/+14
| | | | |
| * | | | Removed redundant log decode callGreg Hysen2018-05-191-2/+0
| | | | |
| * | | | The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-198-141/+98
| | | | |
| * | | | Updated order of settleMatchedOrders to align with settleOrderGreg Hysen2018-05-193-8/+8
| | | | |
| * | | | IExchange inherits from all other interfaces (in the same order as Exchange ↵Greg Hysen2018-05-191-6/+10
| | | | | | | | | | | | | | | | | | | | inherits Mixins)
| * | | | Renamed takerAssetFilledAmount to orderFilledAmount to more easily ↵Greg Hysen2018-05-193-37/+37
| | | | | | | | | | | | | | | | | | | | distinguish between fill results and order state
| * | | | Comments for readability in exchange core and mixin match ordersGreg Hysen2018-05-195-4/+11
| | | | |
| * | | | Renamed "validate" functions to "assert" in mixin match.Greg Hysen2018-05-195-21/+21
| | | | |
| * | | | Throw if the left or right orders do not compute the correct fill results. I ↵Greg Hysen2018-05-195-37/+27
| | | | | | | | | | | | | | | | | | | | like this better than just logging an error and failing silently.
| * | | | Removed redundant status checks in matchOrders. Saves gas, plus follows ↵Greg Hysen2018-05-191-8/+0
| | | | | | | | | | | | | | | | | | | | pattern of fillOrder more closely.
| * | | | Token -> Asset in fillOrder specGreg Hysen2018-05-191-1/+1
| | | | |
| * | | | Reordered functions in mixin exchange core -- getOrderInfo is at the bottomGreg Hysen2018-05-192-77/+77
| | | | |
| * | | | Changes based on style guidelines put out by AmirGreg Hysen2018-05-199-172/+210
| | | | |
| * | | | Reordered fund transfers for matched orders, plus added an extra sanity ↵Greg Hysen2018-05-193-35/+49
| | | | | | | | | | | | | | | | | | | | check to order matching calculations
| * | | | Style changes to atomic order matchingGreg Hysen2018-05-1911-306/+288
| | | | |
| * | | | Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-196-40/+75
| | | | |
| * | | | Updated remaining contracts to v0.4.23Greg Hysen2018-05-194-4/+4
| | | | |
| * | | | Removed isRoundingError from mixin headerGreg Hysen2018-05-191-10/+1
| | | | |
| * | | | Atomic Order Matching - TestsGreg Hysen2018-05-198-23/+1390
| | | | |
| * | | | Atomic Order Matching - Smart Contracts.Greg Hysen2018-05-1913-114/+957
| | | | |
* | | | | merge developmentFabio Berger2018-05-2211-2/+12
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | / Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-1713-1/+14
| | |/ | |/|
* | | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-padJacob Evans2018-05-181-1/+2
|\ \ \ | | | | | | | | ERC721Proxy Pad to 32 if asset ids are small
| * | | Pad to 32 if asset ids are smallJacob Evans2018-05-101-1/+2
| | | |
* | | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-166-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-versionAlex Browne2018-05-161-0/+3
| |\ \ \ | | |_|/ | |/| | Document Node.js version requirement and add it to package.json
| | * | Change minimum Node version to 6.12Alex Browne2018-05-151-1/+1
| | | |
| | * | Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-151-0/+3
| | | |
| * | | Fix sol-compiler binary so it can be called directly from packagesFabio Berger2018-05-151-1/+1
| | | |
| * | | Fix abi-gen binary so it can be called directly from packagesFabio Berger2018-05-151-1/+2
| | | |
| * | | Move from using lerna multi-package commands to wsrun, update README's ↵Fabio Berger2018-05-152-16/+4
| |/ / | | | | | | | | | accordingly
| * | Add missing type definitionsLeonid Logvinov2018-05-146-13/+22
| | |
* | | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-1629-345/+394
|\| | | |/ |/|
| * Revert "Remove gitkeeps"Fabio Berger2018-05-121-0/+0
| | | | | | | | This reverts commit 3f6876c4199353b597e1b0ebcf3907d6b8cce284.
| * Remove gitkeepsFabio Berger2018-05-111-0/+0
| |
| * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1117-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 errorsLeonid Logvinov2018-05-1112-12/+12
| | |
| | * Remove unused deployer docs configsLeonid Logvinov2018-05-1013-50/+50
| | |
| | * Fix linter issuesLeonid Logvinov2018-05-1013-51/+56
| | |
| | * Rename deployer to sol-compilerLeonid Logvinov2018-05-102-3/+3
| | |
| | * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-1017-176/+303
| | |
| * | Add artifacts to clean commandFabio Berger2018-05-111-1/+1
| | |
| * | Commit v1 artifacts to migrations package and remove compile step from prebuildFabio Berger2018-05-111-1/+1
| | |
| * | Fix tslint errorsFabio Berger2018-05-101-1/+1
| | |
| * | Merge branch 'development' into breakUp0xjsFabio Berger2018-05-106-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 pathsLeonid Logvinov2018-05-071-2/+2
| | |
| | * Move artifacts from src/artifacts to artifacts/v1Leonid Logvinov2018-05-071-1/+1
| | |
| | * Implement new artifacts formatLeonid Logvinov2018-05-076-35/+50
| | |
| * | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵Fabio Berger2018-05-105-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.1Leonid Logvinov2018-05-051-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.13Leonid Logvinov2018-05-051-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.0Leonid Logvinov2018-05-041-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 gitignoreAmir Bandeali2018-05-0921-52/+325
| |
* | Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-0810-63/+97
| |
* | Split up mixins and interfacesAmir Bandeali2018-05-0529-745/+508
| |
* | Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-055-33/+180
| |
* | Update contracts with revert reasons and constructor keywordAmir Bandeali2018-05-0342-181/+410
| |
* | Add MixinAssetProxy to reuse redundant codeAmir Bandeali2018-05-034-98/+117
| |
* | Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
| |
* | Add batchTransferFrom to asset proxiesAmir Bandeali2018-05-023-9/+111
| |
* | Remove outdated commentAmir Bandeali2018-05-012-4/+2
| |
* | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-016-5/+76
| |
* | Move TokenRegistry to 'previous' directoryAmir Bandeali2018-04-272-2/+2
| |
* | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-2719-271/+448
| |
* | Add LibFillResultsAmir Bandeali2018-04-2711-78/+107
| |
* | Add ERC721 contracts from zeppelin-solidityAmir Bandeali2018-04-276-4/+574
| |
* | Add tests and commentsAmir Bandeali2018-04-275-31/+50
| |
* | Add testsAmir Bandeali2018-04-271-4/+38
| |
* | Update tests and utilsAmir Bandeali2018-04-277-1/+226
| |
* | Implement sender abstractionAmir Bandeali2018-04-276-47/+210
| |
* | Fix prettierFabio Berger2018-04-251-3/+9
| |
* | Fix merge conflict issuesFabio Berger2018-04-242-2/+0
| |
* | merge v2-prototypeFabio Berger2018-04-248-285/+309
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-248-286/+308
| | |
* | | Fix testsAmir Bandeali2018-04-2410-181/+116
| | |
* | | Combine Exchange with AssetProxyDispatcherAmir Bandeali2018-04-247-67/+58
|/ /
* | Define numbers of dummy tokens to deploy in constantsAmir Bandeali2018-04-243-2/+4
| |
* | Remove type assertionsAmir Bandeali2018-04-241-18/+12
| |
* | Fix and cleanup testsAmir Bandeali2018-04-248-673/+587
| |
* | Add ERC721 wrapperAmir Bandeali2018-04-242-20/+161
| |
* | Add ERC20WrapperAmir Bandeali2018-04-243-32/+127
| |
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-236-57/+57
| |
* | Rename missed variablesAmir Bandeali2018-04-237-274/+274
| |
* | Reorder event argsAmir Bandeali2018-04-221-10/+10
| |
* | Add missing async suffixAmir Bandeali2018-04-222-12/+12
| |
* | Rename token => assetAmir Bandeali2018-04-2215-656/+656
| |
* | Rename Token => IERC20TokenAmir Bandeali2018-04-228-156/+48
| |
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-2214-108/+61
| |
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-226-85/+83
| |
* | Fix names and visibilities, use address type over contract type for function ↵Amir Bandeali2018-04-225-22/+21
| | | | | | | | args and returns
* | Remove unused constructor argumentsAmir Bandeali2018-04-225-34/+18
| |
* | Add presigned signature typeAmir Bandeali2018-04-211-1/+29
| |
* | Fix zeppelin imports, run prettierAmir Bandeali2018-04-213-4/+3
| |
* | Added tests for (most functions in) LibBytes. The write methods are not ↵Greg Hysen2018-04-213-2/+241
| | | | | | | | currently compatible with our generated contract wrappers.
* | Added description for the DummyERC721Token constructorGreg Hysen2018-04-211-0/+6
| |
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵Greg Hysen2018-04-216-29/+33
| | | | | | | | confusion. Also updated the function description.
* | Reverting earlier change: interfaces now inherit from other interfacesGreg Hysen2018-04-212-2/+10
| |
* | Clarified that 0x0 could be passed into AssetProxyDispatcherGreg Hysen2018-04-212-4/+4
| |
* | Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵Greg Hysen2018-04-213-132/+5
| | | | | | | | exists in Typescript). This simplifies the code.
* | Added @TODO for safeTransferFrom support in ERC721 proxyGreg Hysen2018-04-211-0/+2
| |
* | Removed outdated TODO comment in MixinSettlementProxyGreg Hysen2018-04-211-2/+0
| |
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-218-23/+38
| |
* | Ran prettierGreg Hysen2018-04-214-58/+15
| |
* | renaming after tokenTransferProxy was removedGreg Hysen2018-04-214-127/+127
| |
* | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-2117-631/+82
| |
* | Updated commenting. Noted that transferFrom succeeds or throws on all ↵Greg Hysen2018-04-214-7/+7
| | | | | | | | transferFrom implementations.
* | switched to constants in default order params.Greg Hysen2018-04-212-4/+4
| |
* | Reverted change that allowed ERC721 transfer proxy to be called with amount ↵Greg Hysen2018-04-212-14/+10
| | | | | | | | 0. This now throws.
* | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-2110-239/+237
| |
* | Added clarity to not-authorized test case in dispatcherGreg Hysen2018-04-211-3/+4
| |
* | toUnsigned -> toBuffer in assetProxyUtilsGreg Hysen2018-04-211-1/+1
| |
* | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves ↵Greg Hysen2018-04-211-5/+17
| | | | | | | | 900 gas
* | address -> IAssetProxy where possible for clarityGreg Hysen2018-04-212-13/+13
| |
* | Reverted to calling read/write uint256Greg Hysen2018-04-212-2/+28
| |
* | More testing of common functionality across proxiesGreg Hysen2018-04-211-19/+58
| |
* | Updates to proxy tests.Greg Hysen2018-04-211-13/+13
| |
* | More authorized -> owner in test commentsGreg Hysen2018-04-211-3/+3
| |
* | Removed unnecessary deployments in testGreg Hysen2018-04-211-17/+1
| |
* | Moved ERC721 FillOrderNoThrow tests into wrapperGreg Hysen2018-04-212-45/+60
| |
* | Style improvements to the Asset Proxy testsGreg Hysen2018-04-212-134/+140
| |
* | Replaced instances of `accounts[0]` with `owner` in contracts test casesGreg Hysen2018-04-215-23/+26
| |
* | Minor changes to typescript testsGreg Hysen2018-04-213-8/+6
| |
* | Minor fixes to the contractsGreg Hysen2018-04-213-2/+5
| |
* | Rearranged preconditions in ERC721 proxyGreg Hysen2018-04-211-3/+3
| |
* | Changed order of encode/decode functions in token proxiesGreg Hysen2018-04-213-36/+36
| |
* | Updated name of AssetProxyChanged -> AssetProxySetGreg Hysen2018-04-213-3/+4
| |
* | Explicity declare `memory` for complex types, where possibleGreg Hysen2018-04-213-5/+5
| |
* | Improved readability of FillOrderNoThrow IIGreg Hysen2018-04-211-15/+15
| |
* | Improved readability of FillOrderNoThrowGreg Hysen2018-04-211-4/+4
| |
* | Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-215-10/+10
| |
* | Ran prettier/linter on new contract testsGreg Hysen2018-04-213-4/+0
| |
* | Added comments around deploying contracts to helper/wrapper testsGreg Hysen2018-04-212-65/+34
| |
* | TS styles in core contract testsGreg Hysen2018-04-211-91/+38
| |
* | Added more comments to proxy testsGreg Hysen2018-04-211-52/+25
| |
* | Cleaned up TS in dispatcher testsGreg Hysen2018-04-211-44/+36
| |
* | Proxy Metadata -> DataGreg Hysen2018-04-212-9/+9
| |
* | Cleaning up some wordingGreg Hysen2018-04-215-28/+26
| |
* | Removed some unused ERC721 tokensGreg Hysen2018-04-211-62/+13
| |
* | Minor style improvements to asset proxy utilsGreg Hysen2018-04-216-72/+65
| |
* | ethereum-js for encoding/decoding asset proxy dataGreg Hysen2018-04-211-41/+32
| |
* | Added memory to bytes arrays, where possibleGreg Hysen2018-04-214-7/+7
| |
* | Replaced read/write Uint256 with generic bytes32, plus castingGreg Hysen2018-04-214-16/+16
| |
* | Updated public -> externalGreg Hysen2018-04-216-9/+9
| |
* | Removed unused dependencyGreg Hysen2018-04-211-1/+0
| |
* | snake case to camel caseGreg Hysen2018-04-211-25/+25
| |
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-217-46/+46
| |
* | nilAddress to ZeroEx.NULL_ADDRESSGreg Hysen2018-04-215-27/+22
| |
* | IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing ↵Greg Hysen2018-04-213-7/+8
| | | | | | | | 0-condition in ERC721 transfer
* | Removed Log prefix from eventsGreg Hysen2018-04-212-5/+5
| |
* | Removed unnecessary assetProxyManagerAddressGreg Hysen2018-04-215-29/+17
| |
* | removed unnecessary importGreg Hysen2018-04-211-2/+0
| |
* | setAssetProxy to addAssetProxyGreg Hysen2018-04-216-23/+23
| |
* | Renamed TransferProxy to ProxyGreg Hysen2018-04-215-13/+14
| |
* | Renaming TransferProxy to ProxyGreg Hysen2018-04-2110-56/+56
| |
* | ERC20 V1 proxy compilingGreg Hysen2018-04-211-3/+3
| |
* | Changed order of write parameters in LibBytes. Now ordered by most ↵Greg Hysen2018-04-214-10/+10
| | | | | | | | generalized to most specific
* | Asset Proxy DispatcherGreg Hysen2018-04-2129-145/+2459
| |
* | Fix mergeFabio Berger2018-04-211-2/+2
| |
* | Use addFillResults function and add comments to all marketFill functionsAmir Bandeali2018-04-211-36/+84
| |
* | Fix EtherDelta importsAmir Bandeali2018-04-211-2/+2
| |
* | Add back require statements and tests (will move to another PR)Amir Bandeali2018-04-212-3/+50
| |
* | Revert variable namingAmir Bandeali2018-04-2113-444/+454
| |
* | Update Solidity syntax and commentsAmir Bandeali2018-04-215-70/+67
| |
* | Return all amounts traded and fees paidAmir Bandeali2018-04-217-106/+115
| |
* | Add tests for marketBuyOrdersAmir Bandeali2018-04-212-4/+174
| |
* | Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-2111-645/+681
| |
* | Fix build errorsAmir Bandeali2018-04-214-26/+27
| |
* | Separate filled/cancelled errorsAmir Bandeali2018-04-214-6/+8
| |
* | Remove partial cancelsAmir Bandeali2018-04-218-141/+35
| |
* | updated test name to reflect smart contractsGreg Hysen2018-04-211-1/+1
| |
* | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵Greg Hysen2018-04-215-35/+40
| | | | | | | | 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 Hysen2018-04-213-18/+18
| |
* | Fixed spacingGreg Hysen2018-04-214-56/+56
| |
* | Implementation and tests in the protocol for cancelling all orders up to a ↵Greg Hysen2018-04-217-16/+134
| | | | | | | | specific time
* | Update copyright headersAmir Bandeali2018-04-2130-24/+150
| |
* | Add private keys for testrpc mnemonicAmir Bandeali2018-04-215-70/+20
| |
* | Address feedback and lintAmir Bandeali2018-04-2119-176/+92
| |
* | Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-213-130/+344
| |
* | Fix fillOrderNoThrowAmir Bandeali2018-04-211-29/+15
| |
* | Add logging to testrpc scriptAmir Bandeali2018-04-211-0/+1
| |
* | Fix package.jsonAmir Bandeali2018-04-212-6/+5
| |
* | Bump Solidity version to 0.4.21Amir Bandeali2018-04-2120-30/+29
| |
* | Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-212-6/+69
| |
* | Update formattingAmir Bandeali2018-04-214-34/+40
| |
* | Update fillOrderNoThrowAmir Bandeali2018-04-211-111/+103
| |
* | Update order utilsAmir Bandeali2018-04-211-5/+5
| |
* | Modify tests to work with new utilsAmir Bandeali2018-04-214-584/+632
| |
* | Add script for starting testrpc with preconfigured private keysAmir Bandeali2018-04-213-0/+72
| |
* | Add utils for hashing and signing orders, update wrappersAmir Bandeali2018-04-216-53/+96
| |
* | Modify utils to work with new signature formatAmir Bandeali2018-04-217-150/+189
| |
* | Change order field namesAmir Bandeali2018-04-215-74/+73
| |
* | Fix log decodingAmir Bandeali2018-04-211-13/+13
| |
* | Revert getOrderHash to old logicAmir Bandeali2018-04-211-2/+16
| |
* | Fix compile errorsAmir Bandeali2018-04-2111-30/+54
| |
* | Update fillOrderNoThrowRemco Bloemen2018-04-211-39/+45
| |
* | Use ABIv2 exchange core in wrapper functionsRemco Bloemen2018-04-211-55/+34
| |
* | Implement ABIv2 in ExchangeCoreRemco Bloemen2018-04-212-60/+33
| |
* | Implement EIP712 and ABIv2 in LibOrderRemco Bloemen2018-04-211-20/+12
| |
* | Add logDecoder, remove outdated testsAmir Bandeali2018-04-211-13/+14
| |
* | Merge developmentAmir Bandeali2018-04-211-105/+0
| |
* | Run prettierAmir Bandeali2018-04-211-1/+1
| |
* | Fix utils to work with new ABIAmir Bandeali2018-04-211-0/+105
| |
* | Add fillOrderNoThrow and wrapper functionsAmir Bandeali2018-04-211-1/+1
| |
* | Fix compile errorsAmir Bandeali2018-04-216-22/+22
| |
* | Fix spelling of latterRemco Bloemen2018-04-211-1/+1
| |
* | Add offset to signatureRemco Bloemen2018-04-211-11/+13
| |
* | Document noThrow wrapper and correct fixed array offsetRemco Bloemen2018-04-211-39/+81
| |
* | Add Trezor signaturesRemco Bloemen2018-04-211-0/+23
| |
* | Add TodosRemco Bloemen2018-04-212-0/+3
| |
* | Fix documentationRemco Bloemen2018-04-211-3/+3
| |
* | Verify length on EIP712 signaturesRemco Bloemen2018-04-211-1/+2
| |
* | Remove unused return valueRemco Bloemen2018-04-211-3/+0
| |
* | Spelling fixesRemco Bloemen2018-04-211-7/+8
| |
* | Add documentationRemco Bloemen2018-04-211-2/+16
| |
* | Make wrappers external againRemco Bloemen2018-04-211-2/+2
| |
* | Explicit returnsRemco Bloemen2018-04-211-5/+6
| |
* | Revert cancel order signature abstractionRemco Bloemen2018-04-211-7/+2
| |
* | Fix hash argument nameRemco Bloemen2018-04-211-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 10:14:36 +0800