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

Only reset currentContextAddress if it was previously updated

Browse Source
This commit is contained in:
Amir Bandeali
2018-07-05 13:29:11 -07:00
parent d634775d40
commit 0ea3b10efd
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol vendored
View File

@@ -99,10 +99,11 @@ contract MixinTransactions is
"FAILED_EXECUTION" "FAILED_EXECUTION"
); );
// Reset current transaction signer // Reset current transaction signer if it was previously updated
// TODO: Check if gas is paid when currentContextAddress is already 0. if (signerAddress != msg.sender) {
currentContextAddress = address(0); currentContextAddress = address(0);
} }
}
/// @dev Calculates EIP712 hash of the Transaction. /// @dev Calculates EIP712 hash of the Transaction.
/// @param salt Arbitrary number to ensure uniqueness of transaction hash. /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
@@ -120,6 +121,7 @@ contract MixinTransactions is
{ {
bytes32 schemaHash = EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH; bytes32 schemaHash = EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH;
bytes32 dataHash = keccak256(data); bytes32 dataHash = keccak256(data);
// Assembly for more efficiently computing: // Assembly for more efficiently computing:
// keccak256(abi.encode( // keccak256(abi.encode(
// EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH, // EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
@@ -127,6 +129,7 @@ contract MixinTransactions is
// signerAddress, // signerAddress,
// keccak256(data) // keccak256(data)
// )); // ));
assembly { assembly {
let memPtr := mload(64) let memPtr := mload(64)
mstore(memPtr, schemaHash) mstore(memPtr, schemaHash)