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

@0x:contracts-exchange Changed the signature validation stub function to not require state

Browse Source
This commit is contained in:
Alex Towle
2019-08-19 15:34:35 -07:00
committed by Amir Bandeali
parent 4b970905cf
commit d845b318b9
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/exchange/contracts/test/TestTransactions.sol
View File

@@ -26,9 +26,6 @@ import "../src/MixinTransactions.sol";
contract TestTransactions is
Exchange
{
// Indicates whether or not the overridden _isValidTransactionWithHashSignature should return true or false.
bool public shouldBeValid;
// Indicates whether or not the fallback function should succeed.
bool public shouldSucceedCall;
@@ -99,12 +96,19 @@ contract TestTransactions is
ZeroExTransaction memory,
bytes32,
address,
bytes memory
bytes memory signature
)
internal
view
returns (bool)
{
return shouldBeValid;
if (
signature.length == 2 &&
signature[0] == 0x0 &&
signature[1] == 0x0
) {
return false;
}
return true;
}
}

26
contracts/exchange/test/transactions_unit_tests.ts
View File

@@ -354,9 +354,6 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
});
it('should revert if the signer != msg.sender and the signature is not valid', async () => {
// Set the contract to not accept signatures. Note: This doesn't need to be called but is kept for readability.
// await expect(transactionsContract.setShouldBeValid.sendTransactionAsync(false)).to.be.fulfilled('');
const currentTimestamp = await getLatestBlockTimestampAsync();
const transaction = {
...EMPTY_ZERO_EX_TRANSACTION,
@@ -364,7 +361,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
signerAddress: accounts[1], // This is different than the account that will be used to send.
domain,
};
const signature = randomSignature();
const signature = '0x0000'; // This is the invalid signature
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
const expectedError = new ExchangeRevertErrors.TransactionSignatureError(
transactionHash,
@@ -378,9 +375,6 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
});
it('should revert if the signer == msg.sender but the delegatecall fails', async () => {
// Set the contract to fail on calls to the fallback function. Note: This call is unnecessary but is kept for readability.
// await expect(transactionsContract.setShouldBeValid.sendTransactionAsync(false)).to.be.fulfilled('');
const currentTimestamp = await getLatestBlockTimestampAsync();
const transaction = {
...EMPTY_ZERO_EX_TRANSACTION,
@@ -400,9 +394,6 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
});
it('should revert if the signer != msg.sender and the signature is valid but the delegatecall fails', async () => {
// Set the contract to accept signatures.
await expect(transactionsContract.setShouldBeValid.sendTransactionAsync(true)).to.be.fulfilled('');
// Set the contract to fail on calls to the fallback function. Note: This call is unnecessary but is kept for readability.
// await expect(transactionsContract.setShouldSucceedCall.sendTransactionAsync(false)).to.be.fulfilled('');
@@ -413,21 +404,19 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
signerAddress: accounts[1], // This is different than the account that will be used to send.
domain,
};
const validSignature = randomSignature(); // Valid because length != 2
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHash,
constants.NULL_BYTES,
);
const tx = transactionsContract.executeTransaction.sendTransactionAsync(transaction, randomSignature(), {
const tx = transactionsContract.executeTransaction.sendTransactionAsync(transaction, validSignature, {
from: accounts[0],
});
return expect(tx).to.revertWith(expectedError);
});
it('should revert with the correct return data if the signer != msg.sender and the signature is valid but the delegatecall fails', async () => {
// Set the contract to accept signatures.
await expect(transactionsContract.setShouldBeValid.sendTransactionAsync(true)).to.be.fulfilled('');
// Set the contract to fail on calls to the fallback function. Note: This call is unnecessary but is kept for readability.
// await expect(transactionsContract.setShouldCallSucceed.sendTransactionAsync(false)).to.be.fulfilled('');
@@ -437,6 +426,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
);
const currentTimestamp = await getLatestBlockTimestampAsync();
const validSignature = randomSignature(); // Valid because length != 2
const transaction = {
...EMPTY_ZERO_EX_TRANSACTION,
expirationTimeSeconds: new BigNumber(currentTimestamp).plus(10),
@@ -445,16 +435,13 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
};
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
const expectedError = new ExchangeRevertErrors.TransactionExecutionError(transactionHash, '0xdeadbeef');
const tx = transactionsContract.executeTransaction.sendTransactionAsync(transaction, randomSignature(), {
const tx = transactionsContract.executeTransaction.sendTransactionAsync(transaction, validSignature, {
from: accounts[0],
});
return expect(tx).to.revertWith(expectedError);
});
it('should succeed with the correct return hash and event emitted', async () => {
// Set the contract to accept signatures.
await expect(transactionsContract.setShouldBeValid.sendTransactionAsync(true)).to.be.fulfilled('');
// Set the contract to fail on calls to the fallback function. Note: This call is unnecessary but is kept for readability.
await expect(transactionsContract.setShouldCallSucceed.sendTransactionAsync(true)).to.be.fulfilled('');
@@ -465,6 +452,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
// Set up the necessary data for the transactions and tests
const currentTimestamp = await getLatestBlockTimestampAsync();
const validSignature = randomSignature(); // Valid because length != 2
const transaction = {
...EMPTY_ZERO_EX_TRANSACTION,
expirationTimeSeconds: new BigNumber(currentTimestamp).plus(10),
@@ -474,7 +462,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
// Verify that the returndata of the transaction is 0xDEADBEEF
const result = await transactionsContract.executeTransaction.callAsync(transaction, randomSignature(), {
const result = await transactionsContract.executeTransaction.callAsync(transaction, validSignature, {
from: accounts[0],
});
expect(result === '0xdeadbeef').to.be.true();