diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-12-04 09:19:58 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-12-19 05:36:05 +0800 |
| commit | 28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26 (patch) | |
| tree | 5dabbc22ecdd898dbadb21245700df844d23a64f /packages | |
| parent | c040ad085063ec67abfd73c5cf61739f54d2a7a6 (diff) | |
| download | dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.tar dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.tar.gz dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.tar.bz2 dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.tar.lz dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.tar.xz dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.tar.zst dexon-sol-tools-28a5ed6a9a1e44dd298d98f9f4bcb65b1d021e26.zip | |
cleaning
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol b/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol index 2d06d69e6..687e931da 100644 --- a/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol +++ b/packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol @@ -72,21 +72,13 @@ contract CompliantForwarder is ExchangeSelectors{ mstore(add(addressesToValidate_, offset), addressToValidate) } - function toGlobalCalldataOffset(offset) -> globalOffset { - globalOffset := add(0x4, offset) - } - - function toExchangeCalldataOffset(offset, orderParamIndex) -> exchangeOffset { + function exchangeCalldataload(offset) -> value { // exchangeTxPtr at global level // 0x20 for length offset into exchange TX // 0x4 for function selector in exhcange TX let exchangeTxPtr := calldataload(0x44) - exchangeOffset := add(0x4, add(exchangeTxPtr, add(0x24, offset))) - } - - function exchangeCalldataload(offset) -> value { - - value := calldataload(toExchangeCalldataOffset(offset, 0)) + let exchangeOffset := add(0x4, add(exchangeTxPtr, add(0x24, offset))) + value := calldataload(exchangeOffset) } function appendMakerAddressFromOrder(orderParamIndex) { |