Updated tests

Author: maxsam4

contracts/modules/Experimental/TransferManager/SignedTransferManager.sol

@@ -142,7 +142,7 @@ contract SignedTransferManager is TransferManager {
         (targetAddress, nonce, expiry, signature) = abi.decode(_data, (address, uint256, uint256, bytes));
 
         require(!_checkSignatureIsInvalid(signature), "Signature already invalid");
-        require(targetAddress != address(this), "Signature not for this module");
+        require(targetAddress == address(this), "Signature not for this module");
 
         bytes32 hash = keccak256(abi.encodePacked(targetAddress, nonce, expiry, _from, _to, _amount));
         bytes32 prependedHash = keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", hash));

test/helpers/signData.js

@@ -18,13 +18,14 @@ function signData(tmAddress, investorAddress, fromTime, toTime, expiryTime, rest
     return ethUtil.ecsign(new Buffer(packedData.slice(2), "hex"), new Buffer(pk, "hex"));
 }
 
-function getSignTMSig(tmAddress, fromAddress, toAddress, amount, pk) {
-    let hash = web3.utils.soliditySha3({t: 'address', v: tmAddress}, {t: 'address', v: fromAddress}, {t: 'address', v: toAddress}, {t: 'uint256', v: new BN(amount)});
-    let sign = web3.eth.accounts.sign(hash, pk);
-    return sign.signature;
+function getSignTMData(tmAddress, nonce, expiry, fromAddress, toAddress, amount, pk) {
+    let hash = web3.utils.soliditySha3({t: 'address', v: tmAddress}, {t: 'uint256', v: new BN(nonce)}, {t: 'uint256', v: new BN(expiry)}, {t: 'address', v: fromAddress}, {t: 'address', v: toAddress}, {t: 'uint256', v: new BN(amount)});
+    let signature = (web3.eth.accounts.sign(hash, pk)).signature;
+    let data = web3.eth.abi.encodeParameters(['address', 'uint256', 'uint256', 'bytes'], [tmAddress, new BN(nonce).toString(), new BN(expiry).toString(), signature]);
+    return data;
 }
 
 module.exports = {
     signData,
-    getSignTMSig
+    getSignTMData
 };

test/zb_signed_transfer_manager.js

@@ -1,7 +1,7 @@
 import latestTime from "./helpers/latestTime";
 import { duration, promisifyLogWatch, latestBlock } from "./helpers/utils";
 import takeSnapshot, { increaseTime, revertToSnapshot } from "./helpers/time";
-import { getSignTMSig } from "./helpers/signData";
+import { getSignTMData } from "./helpers/signData";
 import { pk } from "./helpers/testprivateKey";
 import { encodeProxyCall, encodeModuleCall } from "./helpers/encodeCall";
 import { catchRevert } from "./helpers/exceptions";
@@ -224,26 +224,33 @@ contract("SignedTransferManager", accounts => {
 
             await I_SignedTransferManager.updateSigners([signer.address], [true], {from: token_owner});
 
-            const sig = await getSignTMSig(
+            let nonce = new BN(10);
+            let expiry = new BN(currentTime.add(new BN(duration.days(100))));
+            let data = await getSignTMData(
                 I_SignedTransferManager.address,
+                nonce,
+                expiry,
                 account_investor1,
                 account_investor2,
                 oneeth,
                 signer.privateKey
             );
 
-            assert.equal(await I_SignedTransferManager.checkSignatureIsInvalid(sig), false);
-            await I_SignedTransferManager.invalidateSignature(account_investor1, account_investor2, oneeth, sig, {from: signer.address});
-            assert.equal(await I_SignedTransferManager.checkSignatureIsInvalid(sig), true);
+            assert.equal(await I_SignedTransferManager.checkSignatureValidity(data), true);
+            await I_SignedTransferManager.invalidateSignature(account_investor1, account_investor2, oneeth, data, {from: signer.address});
+            assert.equal(await I_SignedTransferManager.checkSignatureValidity(data), false);
         });
 
         it("should allow transfer with valid sig", async () => {
             let signer = web3.eth.accounts.create();
             await I_SignedTransferManager.updateSigners([signer.address], [true], {from: token_owner});
             let oneeth = new BN(web3.utils.toWei("1", "ether"));
-
-            const sig = await getSignTMSig(
+            let nonce = new BN(10);
+            let expiry = new BN(currentTime.add(new BN(duration.days(100))));
+            let data = await getSignTMData(
                 I_SignedTransferManager.address,
+                nonce,
+                expiry,
                 account_investor1,
                 account_investor2,
                 oneeth,
@@ -253,28 +260,35 @@ contract("SignedTransferManager", accounts => {
             let balance11 = await I_SecurityToken.balanceOf(account_investor1);
             let balance21 = await I_SecurityToken.balanceOf(account_investor2);
 
-            await I_SecurityToken.transferWithData(account_investor2, oneeth, sig, {from: account_investor1});
+            assert.equal(await I_SignedTransferManager.checkSignatureValidity(data), true);
+
+            await I_SecurityToken.transferWithData(account_investor2, oneeth, data, {from: account_investor1});
+
+            assert.equal(await I_SignedTransferManager.checkSignatureValidity(data), false);
+            await catchRevert(I_SecurityToken.transferWithData(account_investor2, oneeth, data, {from: account_investor1}));
 
-            assert.equal(await I_SignedTransferManager.checkSignatureIsInvalid(sig), true);
             assert.equal(balance11.sub(oneeth).toString(), (await I_SecurityToken.balanceOf(account_investor1)).toString());
             assert.equal(balance21.add(oneeth).toString(), (await I_SecurityToken.balanceOf(account_investor2)).toString());
 
-            await catchRevert(I_SecurityToken.transferWithData(account_investor2, oneeth, sig, {from: account_investor1}));
+            
         });
 
         it("should not allow transfer if the signer is not on the signer list", async () => {
             let signer = web3.eth.accounts.create();
             let oneeth = new BN(web3.utils.toWei("1", "ether"));
-
-            const sig = await getSignTMSig(
+            let nonce = new BN(10);
+            let expiry = new BN(currentTime.add(new BN(duration.days(100))));
+            let data = await getSignTMData(
                 I_SignedTransferManager.address,
+                nonce,
+                expiry,
                 account_investor1,
                 account_investor2,
                 oneeth,
                 signer.privateKey
             );
 
-            await catchRevert(I_SecurityToken.transferWithData(account_investor2, oneeth, sig, {from: account_investor1}));
+            await catchRevert(I_SecurityToken.transferWithData(account_investor2, oneeth, data, {from: account_investor1}));
         });
     });
 });