aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
Commit message (Collapse)AuthorAgeFilesLines
* Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-231-7/+18
|
* Refactor LibBytes.readBytes4 for consistencyRemco Bloemen2018-06-231-3/+7
|
* Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-231-0/+10
|
* Rename bytes.equalsRemco Bloemen2018-06-231-13/+13
|
* Rename read/writeBytesWithLengthRemco Bloemen2018-06-231-29/+29
|
* Merge LibMem and LibBytesRemco Bloemen2018-06-233-191/+171
|
* Use provided mem in refernce memcpyRemco Bloemen2018-06-231-2/+2
|
* Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-2210-10/+0
|
* Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵Amir Bandeali2018-06-221-2/+50
| | | | accross all contracts
* Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-221-0/+2
|
* LinterGreg Hysen2018-06-211-2/+1
|
* Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
|
* Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
|
* Remove .onlyGreg Hysen2018-06-211-1/+1
|
* Fixed two mislabelled revert reasons + Signature Validator revert tests ↵Greg Hysen2018-06-211-6/+10
| | | | working on Geth
* Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵Greg Hysen2018-06-211-15/+386
| | | | types. Fixed trezor prefix.
* Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-201-3/+7
|\ | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction
| * Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-1820-608/+1380
| |\
| * | Update Order utils to use eip712Jacob Evans2018-06-062-8/+6
| | |
| * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-051-2/+7
| | |
* | | ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-2/+6
| | |
* | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-202-20/+20
| | |
* | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-201-0/+112
| |/ |/|
* | Rename popByte and popAddressAmir Bandeali2018-06-131-6/+6
| |
* | Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
| |
* | Unpop byte rather than making deep copyAmir Bandeali2018-06-131-0/+4
| |
* | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-134-4/+4
| |
* | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-131-70/+185
| |
* | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-134-60/+136
| |
* | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-121-1/+1
| |
* | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-091-0/+5
| |
* | Linter changes to contractsGreg Hysen2018-06-094-21/+6
| |
* | Updated LibBytes error messagesGreg Hysen2018-06-081-22/+30
| |
* | Cleanup after last rebaseGreg Hysen2018-06-084-6/+5
| |
* | Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
| |
* | Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
| |
* | Camelcase in memCopyGreg Hysen2018-06-081-1/+1
| |
* | Style updates to contractsGreg Hysen2018-06-083-10/+4
| |
* | Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
| |
* | Removed setting makerAssetData/takerAssetData from tests where values are ↵Greg Hysen2018-06-081-34/+0
| | | | | | | | same as defaultOrderParams.
* | Style updates to ERC721 onReceiverGreg Hysen2018-06-082-3/+14
| |
* | Fixes after rebasingGreg Hysen2018-06-083-8/+6
| |
* | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-085-34/+21
| |
* | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-082-27/+32
| |
* | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-082-12/+14
| |
* | Resolved edge case in Memcpy where where send would eventually turn ↵Greg Hysen2018-06-081-133/+137
| | | | | | | | "negative" and wrap around.
* | 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-089-223/+190
| | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData
* | proxyData -> assetDataGreg Hysen2018-06-081-1/+1
| |
* | Add tests for word loop iterationRemco Bloemen2018-06-081-2/+6
| |
* | Add test for zero-size overlapRemco Bloemen2018-06-081-1/+3
| |
* | Add test casesRemco Bloemen2018-06-081-17/+133
| |
* | Cleanup test scriptRemco Bloemen2018-06-081-16/+1
| |
* | Convert Solidity tests to vectorsRemco Bloemen2018-06-081-29/+6
| |
* | Generate tests from vectorsRemco Bloemen2018-06-081-2/+40
| |
* | Tests for writing bytes to nested bytesGreg Hysen2018-06-081-9/+91
| |
* | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-083-18/+165
| |
* | Test for onReceived erc721 callbackGreg Hysen2018-06-082-3/+121
| |
* | LibAssetProxyDecoder testsGreg Hysen2018-06-081-26/+30
| |
* | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-082-1/+73
| |
* | Tests for libMemGreg Hysen2018-06-081-0/+68
| |
* | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-082-23/+53
| |
* | Fix tslint issuesFabio Berger2018-06-082-2/+2
| |
* | Fix missing pathsFabio Berger2018-06-081-4/+4
| |
* | Fixed pathFabio Berger2018-06-072-10/+10
| |
* | merge v2-prototypeFabio Berger2018-06-0716-290/+303
|\ \
| * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-0713-206/+263
| |\ \ | | | | | | | | | | | | feature/improve-linting
| | * | Apply prettierAlex Browne2018-06-072-3/+10
| | | |
| | * | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| | | |
| | * | Apply various fixes based on PR feedbackAlex Browne2018-06-072-11/+54
| | | |
| | * | Add Async suffix to relevant assertionsAlex Browne2018-06-0713-103/+103
| | | |
| | * | Fix linter errorsAlex Browne2018-06-071-6/+2
| | | |
| | * | Update more things to work with both Geth and GanacheAlex Browne2018-06-072-16/+28
| | | |
| | * | Small fixes and cleanupAlex Browne2018-06-071-2/+2
| | | |
| | * | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-072-146/+49
| | | |
| | * | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-071-6/+4
| | | |
| | * | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-073-55/+58
| | | |
| | * | Update more tests to pass on GethAlex Browne2018-06-072-21/+15
| | | |
| | * | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-071-24/+28
| | | |
| | * | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | | |
| | * | Update some tests after rebaseAlex Browne2018-06-073-20/+29
| | | |
| | * | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-076-20/+135
| | | |
| | * | Replace constant.REVERT test assertions with ↵Alex Browne2018-06-0711-168/+141
| | | | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| | * | Update code after rebaseAlex Browne2018-06-071-20/+0
| | | |
| | * | Use Geth for contract testsAlex Browne2018-06-071-0/+20
| | |/
| * / Linter now passesfragosti2018-06-0616-70/+26
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-0617-45/+45
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
|
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-055-71/+70
| | | | failures, and remove redundant logic in matchOrders
* Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
|
* Fix tslint issuesFabio Berger2018-06-022-3/+2
|
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-029-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 errorsLeonid Logvinov2018-06-012-2/+2
| |
| * Introduce ethereum-types packageLeonid Logvinov2018-06-016-6/+8
| |
| * Fix buildAmir Bandeali2018-06-011-1/+1
| |
| * Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-314-21/+54
| |\ | | | | | | Add awaitTransactionSuccess where needed
| | * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-311-1/+1
| | |
| | * Add awaitTransactionSuccess where neededAlex Browne2018-05-313-20/+53
| | |
* | | fix method renameFabio Berger2018-06-011-1/+1
| | |
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-018-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 Bandeali2018-05-311-13/+27
| | | | | | | | | | | | needed, and rename function
| * | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
| | |
| * | Fix formatting and testsAmir Bandeali2018-05-3114-90/+6
| | |
| * | Update WhitelistAmir Bandeali2018-05-311-0/+1
| | |
| * | Use last byte of signature as signature typeAmir Bandeali2018-05-313-32/+28
| | |
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-312-4/+7
| | |
| * | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-311-4/+29
| | |
| * | Add example whitelist contract and minimum testsAmir Bandeali2018-05-311-2/+89
| | |
| * | Add Validator signature typeAmir Bandeali2018-05-311-1/+1
| | |
| * | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-311-0/+34
| |/
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵Fabio Berger2018-05-311-6/+6
| | | | | | | | the smart contracts
* | Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-309-65/+38
|/ | | | package.
* Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-263-102/+85
|
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-255-319/+404
|\ | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress
| * Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-251-5/+4
| |
| * Cleanup testsAmir Bandeali2018-05-253-5/+11
| |
| * Move readFirst4 to LibBytesAmir Bandeali2018-05-252-19/+11
| |
| * Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-252-7/+7
| |
| * Fix buildAmir Bandeali2018-05-251-2/+6
| |
| * Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-251-17/+17
| |
| * Update multisig tests and utilsAmir Bandeali2018-05-253-228/+312
| |
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-256-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 issuesLeonid Logvinov2018-05-252-2/+2
| | |
| * | Migrate migrations to v2Leonid Logvinov2018-05-256-10/+9
| |/
* | Use domain separator for exchange addressJacob Evans2018-05-251-2/+8
| |
* | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-251-1/+1
| |
* | Update order hash to match latest eip712Jacob Evans2018-05-251-0/+6
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-2411-60/+84
|
* Move contract utilsLeonid Logvinov2018-05-244-379/+2
|
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-2416-267/+251
|\
| * Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
| |
| * Fix importFabio Berger2018-05-231-1/+1
| |
| * Fix await callsFabio Berger2018-05-231-12/+3
| |
| * Refactor etherToken test to use contract-wrappersFabio Berger2018-05-231-22/+36
| |
| * Fix ExchangeWrapperFabio Berger2018-05-235-11/+5
| |
| * Fix importsFabio Berger2018-05-231-1/+0
| |
| * Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-2316-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 contractsFabio Berger2018-05-2316-240/+208
| | |
* | | Parse compiler.json in SolCompilerArtifactsAdapterLeonid Logvinov2018-05-231-3/+1
| | |
* | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-231-3/+3
| | |
* | | 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-232-1/+24
| |/ |/|
* | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-2315-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-fixesAlex Browne2018-05-2315-175/+418
| |\ \ | | | | | | | | 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-229-155/+293
| | | |
| | * | 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-231-1/+1
|\ \ \ | |_|/ |/| | Fix build/lint errors and warnings
| * | Add missing return typesRemco Bloemen2018-05-221-1/+1
| |/
* | merge developmentFabio Berger2018-05-232-4/+4
|\ \ | |/ |/|
| * Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-233-8/+8
| |\ | | | | | | Add more tslint rules
| | * Fix TSLint rulesFabio Berger2018-05-163-8/+8
| | |
* | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-224-16/+1200
|\ \ \ | | | | | | | | Atomic Order Matching
| * | | orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-191-12/+12
| | | |
| * | | Rebased against v2-prototypeGreg Hysen2018-05-193-11/+13
| | | |
| * | | 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.
| * | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵Greg Hysen2018-05-191-12/+10
| | | | | | | | | | | | | | | | should be useful for the forwarding contract code.
| * | | Style improvements to the match orders typescript test classGreg Hysen2018-05-191-18/+14
| | | |
| * | | The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-191-64/+41
| | | |
| * | | Throw if the left or right orders do not compute the correct fill results. I ↵Greg Hysen2018-05-191-10/+8
| | | | | | | | | | | | | | | | like this better than just logging an error and failing silently.
| * | | Style changes to atomic order matchingGreg Hysen2018-05-192-2/+1
| | | |
| * | | Atomic Order Matching - TestsGreg Hysen2018-05-194-17/+1243
| | | |
* | | | merge developmentFabio Berger2018-05-2210-1/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-1712-0/+12
| |/
| * Add missing type definitionsLeonid Logvinov2018-05-141-1/+1
| |
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-1619-267/+250
|\|
| * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1114-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 errorsLeonid Logvinov2018-05-1112-12/+12
| | |
| | * Remove unused deployer docs configsLeonid Logvinov2018-05-1013-50/+50
| | |
| | * Fix linter issuesLeonid Logvinov2018-05-1012-49/+53
| | |
| | * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-1014-150/+271
| | |
| * | Fix tslint errorsFabio Berger2018-05-101-1/+1
| | |
| * | Merge branch 'development' into breakUp0xjsFabio Berger2018-05-102-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 formatLeonid Logvinov2018-05-072-4/+3
| | |
| * | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵Fabio Berger2018-05-104-7/+8
| |/ | | | | | | unifying library with the same interface
* | Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-081-3/+3
| |
* | Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-051-22/+30
| |
* | Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
| |
* | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-012-0/+22
| |
* | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-273-178/+248
| |
* | Add tests and commentsAmir Bandeali2018-04-271-15/+25
| |
* | Add testsAmir Bandeali2018-04-271-4/+38
| |
* | Update tests and utilsAmir Bandeali2018-04-271-0/+161
| |
* | Fix prettierFabio Berger2018-04-251-3/+9
| |
* | Fix merge conflict issuesFabio Berger2018-04-242-2/+0
| |
* | merge v2-prototypeFabio Berger2018-04-245-188/+213
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-245-189/+212
| | |
* | | Fix testsAmir Bandeali2018-04-246-175/+59
|/ /
* | Fix and cleanup testsAmir Bandeali2018-04-246-672/+574
| |
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-235-51/+51
| |
* | Rename missed variablesAmir Bandeali2018-04-233-254/+254
| |
* | Add missing async suffixAmir Bandeali2018-04-221-11/+11
| |
* | Rename token => assetAmir Bandeali2018-04-224-453/+453
| |
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-227-37/+37
| |
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-225-51/+51
| |
* | Remove unused constructor argumentsAmir Bandeali2018-04-223-6/+3
| |
* | Added tests for (most functions in) LibBytes. The write methods are not ↵Greg Hysen2018-04-211-0/+238
| | | | | | | | currently compatible with our generated contract wrappers.
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵Greg Hysen2018-04-213-18/+18
| | | | | | | | confusion. Also updated the function description.
* | Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵Greg Hysen2018-04-211-60/+0
| | | | | | | | exists in Typescript). This simplifies the code.
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-215-19/+34
| |
* | Ran prettierGreg Hysen2018-04-214-58/+15
| |
* | renaming after tokenTransferProxy was removedGreg Hysen2018-04-214-127/+127
| |
* | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-217-333/+80
| |
* | 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-211-11/+10
| | | | | | | | 0. This now throws.
* | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-213-176/+159
| |
* | Added clarity to not-authorized test case in dispatcherGreg Hysen2018-04-211-3/+4
| |
* | 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-211-4/+4
| |
* | Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-213-7/+7
| |
* | 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
| |
* | Removed some unused ERC721 tokensGreg Hysen2018-04-211-62/+13
| |
* | Minor style improvements to asset proxy utilsGreg Hysen2018-04-215-62/+62
| |
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-213-28/+28
| |
* | nilAddress to ZeroEx.NULL_ADDRESSGreg Hysen2018-04-215-27/+22
| |
* | Removed unnecessary assetProxyManagerAddressGreg Hysen2018-04-215-29/+17
| |
* | setAssetProxy to addAssetProxyGreg Hysen2018-04-214-21/+21
| |
* | Renamed TransferProxy to ProxyGreg Hysen2018-04-214-11/+13
| |
* | Renaming TransferProxy to ProxyGreg Hysen2018-04-215-48/+48
| |
* | Asset Proxy DispatcherGreg Hysen2018-04-215-20/+1366
| |
* | Add back require statements and tests (will move to another PR)Amir Bandeali2018-04-211-0/+42
| |
* | Revert variable namingAmir Bandeali2018-04-213-303/+313
| |
* | Update Solidity syntax and commentsAmir Bandeali2018-04-212-20/+15
| |
* | Add tests for marketBuyOrdersAmir Bandeali2018-04-211-2/+172
| |
* | Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-213-419/+355
| |
* | Fix build errorsAmir Bandeali2018-04-211-13/+21
| |
* | Separate filled/cancelled errorsAmir Bandeali2018-04-211-2/+2
| |
* | Remove partial cancelsAmir Bandeali2018-04-212-69/+4
| |
* | updated test name to reflect smart contractsGreg Hysen2018-04-211-1/+1
| |
* | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵Greg Hysen2018-04-211-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 Hysen2018-04-211-15/+15
| |
* | Fixed spacingGreg Hysen2018-04-211-51/+51
| |
* | Implementation and tests in the protocol for cancelling all orders up to a ↵Greg Hysen2018-04-211-0/+67
| | | | | | | | specific time
* | Add private keys for testrpc mnemonicAmir Bandeali2018-04-213-6/+6
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 11:24:38 +0800