aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-06-12 02:58:18 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-06-13 02:45:02 +0800
commit2f96cb257c0f7280f8b578eed6a3c1711749c0e9 (patch)
treeb7e2a0838f71b909047b42a4a2c9c6d589195e04
parent5910bec52e0664f70d5dc98ce8303ec5373107ba (diff)
downloaddexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.tar
dexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.tar.gz
dexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.tar.bz2
dexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.tar.lz
dexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.tar.xz
dexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.tar.zst
dexon-sol-tools-2f96cb257c0f7280f8b578eed6a3c1711749c0e9.zip
Looks up the memory location of makerAssetData/takerAssetData
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
index cd5e26fb7..88f916179 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
@@ -174,6 +174,7 @@ contract MixinWrapperFunctions is
mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart))
// Calculate length of <order.makerAssetData>
+ sourceOffset := mload(add(order, 0x140)) // makerAssetData
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
@@ -193,6 +194,7 @@ contract MixinWrapperFunctions is
mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart))
// Calculate length of <order.takerAssetData>
+ sourceOffset := mload(add(order, 0x160)) // takerAssetData
arrayLenBytes := mload(sourceOffset)
sourceOffset := add(sourceOffset, 0x20)
arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)