diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-04-27 03:55:16 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-05-31 08:11:30 +0800 |
commit | d6be6f79ce944258193d01fa3a23c5210e17ed49 (patch) | |
tree | c4c97fb38535ac56fe6527cec5e607ec161a5c61 /packages/contracts/src/contracts | |
parent | 87d36f06fd7116afb62b65cdbc013d93a61d1969 (diff) | |
download | dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.tar dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.tar.gz dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.tar.bz2 dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.tar.lz dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.tar.xz dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.tar.zst dexon-sol-tools-d6be6f79ce944258193d01fa3a23c5210e17ed49.zip |
Add example whitelist contract and minimum tests
Diffstat (limited to 'packages/contracts/src/contracts')
-rw-r--r-- | packages/contracts/src/contracts/current/test/Whitelist/Whitelist.sol | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/packages/contracts/src/contracts/current/test/Whitelist/Whitelist.sol b/packages/contracts/src/contracts/current/test/Whitelist/Whitelist.sol index 02158485e..6955b6d96 100644 --- a/packages/contracts/src/contracts/current/test/Whitelist/Whitelist.sol +++ b/packages/contracts/src/contracts/current/test/Whitelist/Whitelist.sol @@ -19,22 +19,24 @@ pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; -import "../../protocol/Exchange/mixins/MTransactions.sol"; +import "../../protocol/Exchange/Exchange.sol"; import "../../protocol/Exchange/LibOrder.sol"; import "../../utils/Ownable/Ownable.sol"; contract Whitelist is Ownable { mapping (address => bool) public isWhitelisted; - MTransactions EXCHANGE; + Exchange EXCHANGE; - bytes txOriginSignatureType = new bytes(1); + bytes txOriginSignature = new bytes(1); + bytes4 fillOrderFunctionSelector; function Whitelist(address _exchange) public { - EXCHANGE = MTransactions(_exchange); - txOriginSignatureType[0] = 0x04; + EXCHANGE = Exchange(_exchange); + txOriginSignature[0] = 0x04; + fillOrderFunctionSelector = EXCHANGE.fillOrder.selector; } function updateWhitelistStatus(address target, bool isApproved) @@ -48,11 +50,31 @@ contract Whitelist is Ownable { LibOrder.Order memory order, uint256 takerAssetFillAmount, uint256 salt, - bytes memory signature) + bytes memory orderSignature) public { - require(isWhitelisted[msg.sender]); - bytes memory data = abi.encode(order, takerAssetFillAmount, signature); - EXCHANGE.executeTransaction(salt, msg.sender, data, txOriginSignatureType); + address takerAddress = msg.sender; + + // This contract must be the entry point for the transaction. + require(takerAddress == tx.origin); + + // Check if sender is on the whitelist. + require(isWhitelisted[takerAddress]); + + // Encode arguments into byte array. + bytes memory data = abi.encodeWithSelector( + fillOrderFunctionSelector, + order, + takerAssetFillAmount, + orderSignature + ); + + // Call `fillOrder`via `executeTransaction`. + EXCHANGE.executeTransaction( + salt, + takerAddress, + data, + txOriginSignature + ); } }
\ No newline at end of file |