crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,140 Commits 83 Branches 5,211 Tags
Commit Graph

1096 Commits

Author SHA1 Message Date
Fabio Berger
b7c119b2aa Fix many linter errors that showed up upon upgrading tsutil 2018-08-22 18:52:17 +01:00
Fabio Berger
0248add542 Merge development branch 2018-08-22 11:41:42 +01:00
Amir Bandeali
3760eb5baf Add getBalancesAndAllowances 2018-08-21 18:14:22 -07:00
Fabio Berger
301cb296ec Move types from sol-compiler to types so they can be used in other places without requiring sol-compiler as a dep 2018-08-21 23:58:06 +01:00
Amir Bandeali
7fa5b474eb Add ZRX balances and allowances to TraderInfo 2018-08-21 13:53:44 -07:00
Amir Bandeali
dafb282432 Add tests 2018-08-21 11:47:28 -07:00
Amir Bandeali
0918f95421 Don't throw if ERC721 token isn't owned 2018-08-21 11:47:28 -07:00
Amir Bandeali
be67c25b0a Add OrderValidator contract 2018-08-21 11:47:28 -07:00
Amir Bandeali
1ba26ea5e8 Remove redundant constructor args 2018-08-21 10:59:54 -07:00
Alex Browne
da3dc7affc
fix(sol-cov): Remove old files and update config.contractsDir 2018-08-20 13:56:55 -07:00
Amir Bandeali
8bce73dc67 Fix typos, run prettier, and allow anyone to call on DummyERC721Token 2018-08-16 17:32:16 -07:00
Amir Bandeali
09d3d15db0 Fix Geth tests 2018-08-16 17:31:21 -07:00
Amir Bandeali
633e6c38c8 Fix linting errors 2018-08-16 17:31:21 -07:00
Amir Bandeali
a4d6bc3190 Fix tests that assumed logs were being filtered 2018-08-16 17:31:21 -07:00
Amir Bandeali
0b9a9d92af Add tests for ERC721Token 2018-08-16 17:31:21 -07:00
Amir Bandeali
a82e36c1d4 Add ERC721Receiver that returns incorrect value 2018-08-16 17:31:21 -07:00
Amir Bandeali
6dde6d7cb7 Increase max mintable amount 2018-08-16 17:31:21 -07:00
Amir Bandeali
1d70724bcf Fix DummyERC721Receiver 2018-08-16 17:31:21 -07:00
Amir Bandeali
4dd59a370d Add tests for ERC20 token with no return values 2018-08-16 17:31:21 -07:00
Amir Bandeali
7a6e647386 Add constructor back to DummyERC721Token 2018-08-16 17:31:21 -07:00
Amir Bandeali
f5459164d2 Restructure directories 2018-08-16 17:31:21 -07:00
Amir Bandeali
2743eee044 Update checking for erc721 existence 2018-08-16 17:31:21 -07:00
Amir Bandeali
bb3c345891 Update ERC20Token 2018-08-16 17:31:21 -07:00
Amir Bandeali
0f3201d72a Optimize ERC721Token 2018-08-16 17:31:21 -07:00
Fabio Berger
68d7eb5712 Fix comment 2018-08-16 17:02:47 -07:00
Fabio Berger
0337b5a401 Merge development 2018-08-16 15:10:12 -07:00
Fabio Berger
72752bcb68
Merge pull request #928 from 0xProject/dependabot/npm_and_yarn/copyfiles-2.0.0 
Bump copyfiles from 1.2.0 to 2.0.0
 2018-08-16 15:05:47 -07:00
Jacob Evans
622509c508
[Order-utils] Order is valid when maker amount is very small 
Previously our min fillable calculation would throw a rounding error
when encountering a valid order (with a small maker amount). This was
inconsistent with the on-chain logic which allowed this order to be
filled.
 2018-08-15 13:06:32 +10:00
dependabot[bot]
b6cdc00a31
Bump copyfiles from 1.2.0 to 2.0.0 
Bumps [copyfiles](https://github.com/calvinmetcalf/copyfiles) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/calvinmetcalf/copyfiles/releases)
- [Commits](https://github.com/calvinmetcalf/copyfiles/compare/v1.2.0...v2.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-14 21:51:13 +00:00
Fabio Berger
2f2582a0da Merge development 2018-08-14 14:21:47 -07:00
Alex Browne
6baa5ef311
feat: Upgrade TypeScript to 3.0.1 2018-08-14 11:02:04 -07:00
Alex Browne
fadd292ecf
Publish 
- 0x.js@1.0.1-rc.3
 - @0xproject/abi-gen@1.0.5
 - @0xproject/assert@1.0.5
 - @0xproject/base-contract@2.0.0-rc.1
 - @0xproject/connect@1.0.5
 - @0xproject/contract-wrappers@1.0.1-rc.3
 - contracts@2.1.40
 - @0xproject/dev-utils@1.0.4
 - ethereum-types@1.0.4
 - @0xproject/fill-scenarios@1.0.1-rc.3
 - @0xproject/json-schemas@1.0.1-rc.4
 - @0xproject/metacoin@0.0.15
 - @0xproject/migrations@1.0.4
 - @0xproject/monorepo-scripts@1.0.5
 - @0xproject/order-utils@1.0.1-rc.3
 - @0xproject/order-watcher@1.0.1-rc.3
 - @0xproject/react-docs@1.0.5
 - @0xproject/react-docs-example@0.0.20
 - @0xproject/react-shared@1.0.6
 - @0xproject/sol-compiler@1.0.5
 - @0xproject/sol-cov@2.0.0
 - @0xproject/sol-resolver@1.0.5
 - @0xproject/sra-api@1.0.1-rc.4
 - @0xproject/sra-report@1.0.5
 - @0xproject/subproviders@1.0.5
 - @0xproject/testnet-faucets@1.0.41
 - @0xproject/tslint-config@1.0.5
 - @0xproject/types@1.0.1-rc.4
 - @0xproject/typescript-typings@1.0.4
 - @0xproject/utils@1.0.5
 - @0xproject/web3-wrapper@1.2.0
 - @0xproject/website@0.0.44
 2018-08-13 18:34:51 -07:00
Jacob Evans
e51deb93ee
Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-string 
0x.js Return signature as a hex encoded string
 2018-08-14 09:36:11 +10:00
Jacob Evans
ca4905c343
Rename from SignerProviderType.EthSign to SignerType.Default 2018-08-11 18:27:21 +10:00
Amir Bandeali
083319786f
Merge pull request #948 from 0xProject/feature/contracts/forwarderFoK 
[contracts] Make marketBuy functions revert if entire amount not filled
 2018-08-09 17:22:56 -07:00
Amir Bandeali
1b5c5e7a3b Change withdrawERC20 => withdrawAsset, reuse transfer logic 2018-08-09 14:07:27 -07:00
Alex Browne
f3761af567
fix: Update dependencies 2018-08-09 11:35:54 -07:00
Amir Bandeali
b9d8d2d5e3 Make marketBuy functions revert if entire amount not filled 2018-08-09 11:26:32 -07:00
Amir Bandeali
b60a74c8bc
Merge pull request #941 from 0xProject/feature/contracts/returnValuesTests 
[contracts] Test fillOrder return values and abiEncodeFillOrder
 2018-08-09 10:39:14 -07:00
Jacob Evans
45e9fbe8f9
Introduce SignerProviderType 
This allows the developer to indicate the nuanced signer provider. Some have different implementations (trezor, ledger) and others have different implementations (metamask). Breaking the abstraction of eth_sign. EthSign assumes a spec compliant implementation and can be used as a default
 2018-08-09 12:02:12 +10:00
Alex Browne
53713188fe
Merge pull request #915 from 0xProject/feature/encode-decode-checks 
Add strictArgumentEncodingCheck to BaseContract and use it in contract templates
 2018-08-08 18:28:15 -07:00
Amir Bandeali
d10e2652ae Revert incrementing memory ptr in dispatchTransferFrom 2018-08-08 15:44:43 -07:00
Amir Bandeali
9a5d7b7635 Test abiEncodeFillOrder as part of combinatorial follOrder tests 2018-08-08 15:44:43 -07:00
Amir Bandeali
1fb3da6b53 Increment free memory pointer for internal Exchange functions that use asm 2018-08-08 15:44:43 -07:00
Amir Bandeali
970bef717e Add return values to combinatorial fillOrder tests 2018-08-08 15:44:43 -07:00
Amir Bandeali
651a468b44
Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorComments 
[contracts] Fix comments and styling for MixinSignatureValidator
 2018-08-08 15:35:34 -07:00
Alex Browne
6a5965d73b
Add strictArgumentEncodingCheck to BaseContract and use it in contract templates 2018-08-08 14:27:30 -07:00
Alex Browne
13f0d27f7c
Merge pull request #945 from 0xProject/fix/typescript-2.9.2 
Update TypeScript to version 2.9.2
 2018-08-08 14:12:18 -07:00
Amir Bandeali
68fb1bf376 fix comments and styling for MixinSignatureValidator 2018-08-08 13:58:29 -07:00
Alex Browne
6e2e658162
Update TypeScript to version 2.9.2 2018-08-08 11:27:38 -07:00