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

14568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabio B
18366bd58d Merge pull request #2232 from 0xProject/refactor/3.0-wrappers 
Reduce exports from 0x.js
 2019-10-02 06:45:02 +02:00
Amir Bandeali
27c039d51c Fix deployment and configuration tests 2019-10-01 21:44:43 -07:00
Fabio B
8465be2a03 Merge pull request #2226 from 0xProject/feature/publishPrep 
Final RC publish prep
 2019-10-02 05:02:53 +02:00
Amir Bandeali
7d6f49172d Merge pull request #2223 from 0xProject/feat/3.0/do-not-authorize-owner 
Do not authorize owner by default
 2019-10-01 19:54:46 -07:00
Lawrence Forman
d15f4de4ae @0x/contracts-asset-proxy: Inline _grantAllowances() in Eth2DaiBridge. 2019-10-01 19:46:14 -07:00
Lawrence Forman
4098238019 @0x/contracts-asset-proxy: Set allowance every time. 2019-10-01 19:46:14 -07:00
Lawrence Forman
1356237ec9 @0x/contracts-asset-proxy: Rebase and use IERC20Bridge 2019-10-01 19:46:14 -07:00
Lawrence Forman
35daecd5ae @0x/contracts-asset-proxy: Rebase and use @0x/types.AssetProxyId. 2019-10-01 19:46:14 -07:00
Lawrence Forman
bb87c8e7b5 @0x/contracts-asset-proxy: Switch Eth2DaiBridge to support arbitrary tokens. 
`@0x/contracts-asset-proxy`: Support non-conformant tokens in Eth2DaiBridge
 2019-10-01 19:46:14 -07:00
Lawrence Forman
48f7a24505 @0x/contracts-asset-proxy: Rebase and update tests for new proxy selector. 2019-10-01 19:46:14 -07:00
Lawrence Forman
98c59091ab @0x/contracts-asset-proxy: Add comments and update naming convention in IEth2Dai. 2019-10-01 19:46:14 -07:00
Lawrence Forman
4ca08adcfa @0x/contracts-asset-proxy: Rebase and add extra comments. 2019-10-01 19:46:14 -07:00
Lawrence Forman
29bcc1b5b7 @0x/contracts-asset-proxy: omg these insidious only modifiers. 2019-10-01 19:46:14 -07:00
Lawrence Forman
6e4186adbe @0x/contracts-asset-proxy: Add some more unit tests for Eth2DaiBridge. 2019-10-01 19:46:14 -07:00
Lawrence Forman
38e540ad9f @0x/contracts-asset-proxy: Remove only modifier on tests. 2019-10-01 19:46:14 -07:00
Lawrence Forman
7762b7b665 @0x/contracts-asset-proxy: Add signature validation. 2019-10-01 19:46:14 -07:00
Lawrence Forman
82ac8e29e3 @0x/contracts-asset-proxy: Add Eth2DaiBridge and tests. 2019-10-01 19:46:14 -07:00
fabioberger
e074335285 Null out all contracts not re-deployed or updated to V3 2019-10-02 09:15:50 +08:00
xianny
3adbe843da update contract-addresses version 2019-10-01 17:51:25 -07:00
mzhu25
d5c8c076dc Merge pull request #2216 from 0xProject/feature/3.0/forwarder-protocol-fees 
Forwarder protocol fees
 2019-10-01 17:45:02 -07:00
xianny
1d68c4105a redo changes from #2147 2019-10-01 17:17:40 -07:00
Michael Zhu
8077123e9f update contracts and tests to support different maker assets 2019-10-01 16:19:47 -07:00
Michael Zhu
3948f8b66b Replace nonReentrant + refundFinalBalance with refundFinalBalanceNoReentry 2019-10-01 15:39:50 -07:00
Michael Zhu
0ff8b12770 rmeove maker asset equality check; update to reflect removal of weth asset proxy 2019-10-01 13:08:17 -07:00
fabioberger
39a8c0f4e6 Update the Ganache snapshot addresses with latest v3 snapshot 2019-10-01 18:43:56 +08:00
fabioberger
8c5e12d389 Update or add CHANGELOG entries for all packages that will be published by Lerna to include a beta version. This dictates the version published to NPM and avoids any default patch bumps 2019-10-01 17:56:57 +08:00
fabioberger
71660850af Add new addresses to contract-addresses given the latest deployment 2019-10-01 17:11:54 +08:00
fabioberger
b83043648e Also exclude coordinator and extension contract packages when running build 2019-10-01 16:58:05 +08:00
Michael Zhu
b01de802cb address styling nits; only calculate protocol fee once 2019-09-30 21:51:34 -07:00
Michael Zhu
e954e9ca20 update tests 2019-09-30 21:51:34 -07:00
Michael Zhu
3f8639bd9c Update MixinExchangeWrapper to handle protocol fees 2019-09-30 21:51:34 -07:00
Fabio B
56c956df44 Merge pull request #2225 from 0xProject/feature/addDistTagToPublish 
Feature/add dist tag to publish
 2019-10-01 05:41:19 +02:00
James Towle
c4b621e44d Merge pull request #2215 from 0xProject/feature/staking/end-to-end/deployment-test 
End-to-end Deployment Test
 2019-09-30 19:42:41 -07:00
fabioberger
9a658bf932 Change tag to protocolV3 to disambiguate with a specific version of a package 2019-10-01 09:04:20 +08:00
Francesco Agosti
d6d506d1c5 Merge pull request #2219 from 0xProject/feature/sra-v3 
Upgrade @0x/json-schemas, @0x/types, @0x/connect, @sra-spec to SRA V3
 2019-09-30 18:00:29 -07:00
Lawrence Forman
2c8f7fac0e Merge pull request #2220 from 0xProject/feat/erc20-bridge/hello-world 
ERC20BridgeProxy
 2019-09-30 20:52:36 -04:00
Alex Towle
072ff65bf9 @0x:contracts-staking Removed multisig as a dependency 2019-09-30 17:46:57 -07:00
Amir Bandeali
aa198ad15f Add tests for adding/removing an exchange called by owner 2019-09-30 17:42:25 -07:00
Amir Bandeali
745da8e363 Fix tests 2019-09-30 17:36:37 -07:00
Amir Bandeali
be173a9970 Add sender as authorized address before calling init in test contracts 2019-09-30 17:36:37 -07:00
Amir Bandeali
8b2b500414 Remove authorization of owner in StakingProxy after init is called in constructor 2019-09-30 17:36:37 -07:00
Amir Bandeali
98d1f5405a Do not authorize owner in ZrxVault constructor 2019-09-30 17:36:37 -07:00
fragosti
03595dd1dd Run prettier 2019-09-30 17:28:41 -07:00
Lawrence Forman
6da48be1a4 @0x/contracts-asset-proxy: Merge ERC20Bridge into IERC20Bridge. 2019-09-30 17:28:36 -07:00
fragosti
9b91d574f8 Fix failing json-schema test 2019-09-30 17:27:01 -07:00
Alex Towle
6ca8edbf19 @0x:contracts-exchange Moved the deployment test to the exchange and addressed other review comments 2019-09-30 17:25:31 -07:00
Lawrence Forman
579dba1473 @0x/contracts-asset-proxy: Minor ERC20BridgeProxy test changes. 2019-09-30 17:06:31 -07:00
Amir Bandeali
1b5fa15c8c Merge pull request #2222 from 0xProject/feat/3.0/remove-weth-asset-proxy 
Remove wethAssetProxy and wethAssetData from staking contracts
 2019-09-30 17:03:16 -07:00
Lawrence Forman
737ad586a5 @0x/types: Add ERC20Bridge to AssetProxyId 2019-09-30 16:12:01 -07:00
F. Eugene Aumson
c051e11a49 OrderValidationUtils: don't parse fee asset data when there are no fees specified (#2218) 
* exhibit bug: empty fee asset data induces revert

* fix bug: don't parse fee asset data unless fee>0

* Update DevUtils Kovan contract address
 2019-09-30 17:53:21 -04:00