diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-09-05 01:53:18 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-09-05 01:53:18 +0800 |
| commit | e61dbbb6cf395d3bf807340cac8f99f224ec616e (patch) | |
| tree | 04cbe061658c4062423aa6ac40c0968c5b250c90 /packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol | |
| parent | 11df29fa8e4f355ec438966fa9e40cb09fe97380 (diff) | |
| parent | 6a619a4084188d1c48d8030d0fe2a1ba777c55e3 (diff) | |
| download | dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.gz dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.bz2 dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.lz dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.xz dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.zst dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.zip | |
Merge https://github.com/0xProject/0x-monorepo into feature/website/update-portal-v2
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol index a149f95c9..cddff0e5f 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol @@ -36,7 +36,6 @@ contract MixinWrapperFunctions is MExchangeCore, MWrapperFunctions { - /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled. /// @param order Order struct containing order specifications. /// @param takerAssetFillAmount Desired amount of takerAsset to sell. @@ -82,7 +81,7 @@ contract MixinWrapperFunctions is // Delegate to `fillOrder` and handle any exceptions gracefully assembly { let success := delegatecall( - gas, // forward all gas, TODO: look into gas consumption of assert/throw + gas, // forward all gas address, // call address of this contract add(fillOrderCalldata, 32), // pointer to start of input (skip array length in first 32 bytes) mload(fillOrderCalldata), // length of input |