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/extensions/Forwarder/MixinExchangeWrapper.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/extensions/Forwarder/MixinExchangeWrapper.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol index 9e816716c..fea9a53c2 100644 --- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol +++ b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol @@ -34,7 +34,6 @@ contract MixinExchangeWrapper is LibConstants, MExchangeWrapper { - /// @dev Fills the input order. /// Returns false if the transaction would otherwise revert. /// @param order Order struct containing order specifications. @@ -61,7 +60,7 @@ contract MixinExchangeWrapper is // Call `fillOrder` and handle any exceptions gracefully assembly { let success := call( - gas, // forward all gas, TODO: look into gas consumption of assert/throw + gas, // forward all gas exchange, // call address of Exchange contract 0, // transfer 0 wei add(fillOrderCalldata, 32), // pointer to start of input (skip array length in first 32 bytes) |