crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaning

Browse Source
This commit is contained in:
Greg Hysen 2018-12-03 17:26:24 -08:00
parent 28a5ed6a9a
commit df0de07184
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/contracts/contracts/extensions/CompliantForwarder/CompliantForwarder.sol
View File

@ -72,36 +72,46 @@ contract CompliantForwarder is ExchangeSelectors{
mstore(add(addressesToValidate_, offset), addressToValidate) mstore(add(addressesToValidate_, offset), addressToValidate)
} }
function validateAddress(addressToValidate) {
}
function exchangeCalldataload(offset) -> value { function exchangeCalldataload(offset) -> value {
// exchangeTxPtr at global level // exchangeTxPtr at global level
// 0x20 for length offset into exchange TX // 0x20 for length offset into exchange TX
// 0x4 for function selector in exhcange TX // 0x4 for function selector in exhcange TX
let exchangeTxPtr := calldataload(0x44) let exchangeTxPtr := calldataload(0x44)
let exchangeOffset := add(0x4, add(exchangeTxPtr, add(0x24, offset))) let exchangeOffset := add(exchangeTxPtr, add(0x24, offset))
value := calldataload(exchangeOffset) value := calldataload(exchangeOffset)
} }
function loadExchangeData(offset) -> value {
value := exchangeCalldataload(add(offset, 0x4))
}
function appendMakerAddressFromOrder(orderParamIndex) { function appendMakerAddressFromOrder(orderParamIndex) {
let orderPtr := exchangeCalldataload(0) let orderPtr := loadExchangeData(0)
let makerAddress := exchangeCalldataload(orderPtr) let makerAddress := loadExchangeData(orderPtr)
addAddressToValidate(makerAddress) addAddressToValidate(makerAddress)
} }
function appendMakerAddressesFromOrderSet(orderSetParamIndex) -> one { function appendMakerAddressesFromOrderSet(orderSetParamIndex) -> one {
let orderSetPtr := exchangeCalldataload(0) let orderSetPtr := loadExchangeData(0)
let orderSetLength := exchangeCalldataload(orderSetPtr) let orderSetLength := loadExchangeData(orderSetPtr)
let orderSetElementPtr := add(orderSetPtr, 0x20) let orderSetElementPtr := add(orderSetPtr, 0x20)
let orderSetElementEndPtr := add(orderSetElementPtr, mul(orderSetLength, 0x20)) let orderSetElementEndPtr := add(orderSetElementPtr, mul(orderSetLength, 0x20))
for {let orderPtrOffset := orderSetElementPtr} lt(orderPtrOffset, orderSetElementEndPtr) {orderPtrOffset := add(orderPtrOffset, 0x20)} { for {let orderPtrOffset := orderSetElementPtr} lt(orderPtrOffset, orderSetElementEndPtr) {orderPtrOffset := add(orderPtrOffset, 0x20)} {
let orderPtr := exchangeCalldataload(orderPtrOffset) let orderPtr := loadExchangeData(orderPtrOffset)
let makerAddress := exchangeCalldataload(add(orderPtr, orderSetElementPtr)) let makerAddress := loadExchangeData(add(orderPtr, orderSetElementPtr))
addAddressToValidate(makerAddress) addAddressToValidate(makerAddress)
} }
} }
// Extract addresses to validate // Extract addresses to validate
let exchangeTxPtr1 := calldataload(0x44) let selector := and(
let selector := and(calldataload(add(0x4, add(0x20, exchangeTxPtr1))), 0xffffffff00000000000000000000000000000000000000000000000000000000) exchangeCalldataload(0),
0xffffffff00000000000000000000000000000000000000000000000000000000
)
switch selector switch selector
case 0x297bb70b00000000000000000000000000000000000000000000000000000000 /* batchFillOrders */ case 0x297bb70b00000000000000000000000000000000000000000000000000000000 /* batchFillOrders */
{ {