aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/contracts/Exchange.sol1
-rw-r--r--packages/contracts/contracts/TokenRegistry.sol1
-rw-r--r--packages/contracts/contracts/TokenTransferProxy.sol1
-rw-r--r--packages/contracts/contracts/multisig/MultiSigWallet.sol1
-rw-r--r--packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol1
-rw-r--r--packages/contracts/contracts/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol1
-rw-r--r--packages/contracts/contracts/test/DummyToken.sol1
-rw-r--r--packages/contracts/contracts/test/DummyToken_v2.sol1
-rw-r--r--packages/contracts/contracts/test/MaliciousToken.sol1
-rw-r--r--packages/contracts/contracts/test/Mintable.sol1
-rw-r--r--packages/contracts/contracts/test/Mintable_v2.sol1
-rw-r--r--packages/contracts/contracts/tokens/ERC20Token.sol2
-rw-r--r--packages/contracts/contracts/tokens/EtherToken.sol1
-rw-r--r--packages/contracts/contracts/tokens/EtherToken_v2.sol1
-rw-r--r--packages/contracts/contracts/tokens/StandardToken.sol1
-rw-r--r--packages/contracts/contracts/tokens/Token.sol2
-rw-r--r--packages/contracts/contracts/tokens/Token_v2.sol1
-rw-r--r--packages/contracts/contracts/tokens/UnlimitedAllowanceToken.sol1
-rw-r--r--packages/contracts/contracts/tokens/UnlimitedAllowanceToken_v2.sol1
-rw-r--r--packages/contracts/contracts/tokens/ZRXToken.sol1
-rw-r--r--packages/contracts/contracts/utils/Ownable.sol1
-rw-r--r--packages/contracts/contracts/utils/Ownable_v2.sol1
-rw-r--r--packages/contracts/contracts/utils/SafeMath.sol1
-rw-r--r--packages/contracts/contracts/utils/SafeMath_v2.sol1
-rw-r--r--packages/contracts/package.json1
25 files changed, 25 insertions, 2 deletions
diff --git a/packages/contracts/contracts/Exchange.sol b/packages/contracts/contracts/Exchange.sol
index 1da74deef..a402e7ca5 100644
--- a/packages/contracts/contracts/Exchange.sol
+++ b/packages/contracts/contracts/Exchange.sol
@@ -600,3 +600,4 @@ contract Exchange is SafeMath {
return Token(token).allowance.gas(EXTERNAL_QUERY_GAS_LIMIT)(owner, TOKEN_TRANSFER_PROXY_CONTRACT); // Limit gas to prevent reentrancy
}
}
+
diff --git a/packages/contracts/contracts/TokenRegistry.sol b/packages/contracts/contracts/TokenRegistry.sol
index 891d923ee..d2570e71d 100644
--- a/packages/contracts/contracts/TokenRegistry.sol
+++ b/packages/contracts/contracts/TokenRegistry.sol
@@ -306,3 +306,4 @@ contract TokenRegistry is Ownable {
return tokenAddresses;
}
}
+
diff --git a/packages/contracts/contracts/TokenTransferProxy.sol b/packages/contracts/contracts/TokenTransferProxy.sol
index e92c37243..fd2358496 100644
--- a/packages/contracts/contracts/TokenTransferProxy.sol
+++ b/packages/contracts/contracts/TokenTransferProxy.sol
@@ -113,3 +113,4 @@ contract TokenTransferProxy is Ownable {
return authorities;
}
}
+
diff --git a/packages/contracts/contracts/multisig/MultiSigWallet.sol b/packages/contracts/contracts/multisig/MultiSigWallet.sol
index 68f70fe83..ae7ef06fd 100644
--- a/packages/contracts/contracts/multisig/MultiSigWallet.sol
+++ b/packages/contracts/contracts/multisig/MultiSigWallet.sol
@@ -363,3 +363,4 @@ contract MultiSigWallet {
_transactionIds[i - from] = transactionIdsTemp[i];
}
}
+
diff --git a/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol b/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol
index ed625f7f7..62273eba3 100644
--- a/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol
+++ b/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol
@@ -130,3 +130,4 @@ contract MultiSigWalletWithTimeLock is MultiSigWallet {
ConfirmationTimeSet(transactionId, confirmationTime);
}
}
+
diff --git a/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol b/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
index 5c1620808..07beb9f5b 100644
--- a/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
+++ b/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
@@ -80,3 +80,4 @@ contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWall
return true;
}
}
+
diff --git a/packages/contracts/contracts/test/DummyToken.sol b/packages/contracts/contracts/test/DummyToken.sol
index d71edf260..046af3059 100644
--- a/packages/contracts/contracts/test/DummyToken.sol
+++ b/packages/contracts/contracts/test/DummyToken.sol
@@ -33,3 +33,4 @@ contract DummyToken is Mintable, Ownable {
balances[_target] = _value;
}
}
+
diff --git a/packages/contracts/contracts/test/DummyToken_v2.sol b/packages/contracts/contracts/test/DummyToken_v2.sol
index 9b4808703..bd4d06be9 100644
--- a/packages/contracts/contracts/test/DummyToken_v2.sol
+++ b/packages/contracts/contracts/test/DummyToken_v2.sol
@@ -35,3 +35,4 @@ contract DummyToken_v2 is Mintable_v2, Ownable_v2 {
balances[_target] = _value;
}
}
+
diff --git a/packages/contracts/contracts/test/MaliciousToken.sol b/packages/contracts/contracts/test/MaliciousToken.sol
index 9e1322984..3e7d5d1a5 100644
--- a/packages/contracts/contracts/test/MaliciousToken.sol
+++ b/packages/contracts/contracts/test/MaliciousToken.sol
@@ -29,3 +29,4 @@ contract MaliciousToken is StandardToken {
return allowed[_owner][_spender];
}
}
+
diff --git a/packages/contracts/contracts/test/Mintable.sol b/packages/contracts/contracts/test/Mintable.sol
index 3c790534f..3b91415ef 100644
--- a/packages/contracts/contracts/test/Mintable.sol
+++ b/packages/contracts/contracts/test/Mintable.sol
@@ -16,3 +16,4 @@ contract Mintable is UnlimitedAllowanceToken, SafeMath {
totalSupply = safeAdd(totalSupply, _value);
}
}
+
diff --git a/packages/contracts/contracts/test/Mintable_v2.sol b/packages/contracts/contracts/test/Mintable_v2.sol
index 54085e029..829145cfb 100644
--- a/packages/contracts/contracts/test/Mintable_v2.sol
+++ b/packages/contracts/contracts/test/Mintable_v2.sol
@@ -16,3 +16,4 @@ contract Mintable_v2 is UnlimitedAllowanceToken_v2, SafeMath_v2 {
totalSupply = safeAdd(totalSupply, _value);
}
}
+
diff --git a/packages/contracts/contracts/tokens/ERC20Token.sol b/packages/contracts/contracts/tokens/ERC20Token.sol
index 5ec81032f..aead59d6d 100644
--- a/packages/contracts/contracts/tokens/ERC20Token.sol
+++ b/packages/contracts/contracts/tokens/ERC20Token.sol
@@ -55,4 +55,4 @@ contract ERC20Token is Token_v2 {
mapping (address => uint) balances;
mapping (address => mapping (address => uint)) allowed;
uint public totalSupply;
-} \ No newline at end of file
+}
diff --git a/packages/contracts/contracts/tokens/EtherToken.sol b/packages/contracts/contracts/tokens/EtherToken.sol
index d7e51a8f3..2eae012fc 100644
--- a/packages/contracts/contracts/tokens/EtherToken.sol
+++ b/packages/contracts/contracts/tokens/EtherToken.sol
@@ -54,3 +54,4 @@ contract EtherToken is UnlimitedAllowanceToken, SafeMath {
require(msg.sender.send(amount));
}
}
+
diff --git a/packages/contracts/contracts/tokens/EtherToken_v2.sol b/packages/contracts/contracts/tokens/EtherToken_v2.sol
index 1ed668909..28ccf1306 100644
--- a/packages/contracts/contracts/tokens/EtherToken_v2.sol
+++ b/packages/contracts/contracts/tokens/EtherToken_v2.sol
@@ -56,3 +56,4 @@ contract EtherToken_v2 is UnlimitedAllowanceToken_v2, SafeMath_v2 {
Transfer(msg.sender, address(0), _value);
}
}
+
diff --git a/packages/contracts/contracts/tokens/StandardToken.sol b/packages/contracts/contracts/tokens/StandardToken.sol
index 0e5c33a3a..9cd53d94a 100644
--- a/packages/contracts/contracts/tokens/StandardToken.sol
+++ b/packages/contracts/contracts/tokens/StandardToken.sol
@@ -42,3 +42,4 @@ contract StandardToken is Token {
mapping (address => mapping (address => uint)) allowed;
uint public totalSupply;
}
+
diff --git a/packages/contracts/contracts/tokens/Token.sol b/packages/contracts/contracts/tokens/Token.sol
index 10c6c41c1..f18614498 100644
--- a/packages/contracts/contracts/tokens/Token.sol
+++ b/packages/contracts/contracts/tokens/Token.sol
@@ -35,4 +35,4 @@ contract Token {
event Transfer(address indexed _from, address indexed _to, uint _value);
event Approval(address indexed _owner, address indexed _spender, uint _value);
-} \ No newline at end of file
+}
diff --git a/packages/contracts/contracts/tokens/Token_v2.sol b/packages/contracts/contracts/tokens/Token_v2.sol
index bd46dec2b..027f706f4 100644
--- a/packages/contracts/contracts/tokens/Token_v2.sol
+++ b/packages/contracts/contracts/tokens/Token_v2.sol
@@ -36,3 +36,4 @@ contract Token_v2 {
event Transfer(address indexed _from, address indexed _to, uint _value);
event Approval(address indexed _owner, address indexed _spender, uint _value);
}
+
diff --git a/packages/contracts/contracts/tokens/UnlimitedAllowanceToken.sol b/packages/contracts/contracts/tokens/UnlimitedAllowanceToken.sol
index 035993990..0994cfae4 100644
--- a/packages/contracts/contracts/tokens/UnlimitedAllowanceToken.sol
+++ b/packages/contracts/contracts/tokens/UnlimitedAllowanceToken.sol
@@ -50,3 +50,4 @@ contract UnlimitedAllowanceToken is StandardToken {
}
}
}
+
diff --git a/packages/contracts/contracts/tokens/UnlimitedAllowanceToken_v2.sol b/packages/contracts/contracts/tokens/UnlimitedAllowanceToken_v2.sol
index 2da54fee2..b2caab8af 100644
--- a/packages/contracts/contracts/tokens/UnlimitedAllowanceToken_v2.sol
+++ b/packages/contracts/contracts/tokens/UnlimitedAllowanceToken_v2.sol
@@ -44,3 +44,4 @@ contract UnlimitedAllowanceToken_v2 is ERC20Token {
return true;
}
}
+
diff --git a/packages/contracts/contracts/tokens/ZRXToken.sol b/packages/contracts/contracts/tokens/ZRXToken.sol
index 9456d1649..af1dfac99 100644
--- a/packages/contracts/contracts/tokens/ZRXToken.sol
+++ b/packages/contracts/contracts/tokens/ZRXToken.sol
@@ -31,3 +31,4 @@ contract ZRXToken is UnlimitedAllowanceToken {
balances[msg.sender] = totalSupply;
}
}
+
diff --git a/packages/contracts/contracts/utils/Ownable.sol b/packages/contracts/contracts/utils/Ownable.sol
index 5488896d7..77fdaf085 100644
--- a/packages/contracts/contracts/utils/Ownable.sol
+++ b/packages/contracts/contracts/utils/Ownable.sol
@@ -25,3 +25,4 @@ contract Ownable {
}
}
}
+
diff --git a/packages/contracts/contracts/utils/Ownable_v2.sol b/packages/contracts/contracts/utils/Ownable_v2.sol
index 8cdf5985f..77e1fed08 100644
--- a/packages/contracts/contracts/utils/Ownable_v2.sol
+++ b/packages/contracts/contracts/utils/Ownable_v2.sol
@@ -30,3 +30,4 @@ contract Ownable_v2 {
}
}
}
+
diff --git a/packages/contracts/contracts/utils/SafeMath.sol b/packages/contracts/contracts/utils/SafeMath.sol
index cf8ac3265..a7891a7af 100644
--- a/packages/contracts/contracts/utils/SafeMath.sol
+++ b/packages/contracts/contracts/utils/SafeMath.sol
@@ -71,3 +71,4 @@ contract SafeMath {
return a < b ? a : b;
}
}
+
diff --git a/packages/contracts/contracts/utils/SafeMath_v2.sol b/packages/contracts/contracts/utils/SafeMath_v2.sol
index 3a4bbb8fb..6eda03999 100644
--- a/packages/contracts/contracts/utils/SafeMath_v2.sol
+++ b/packages/contracts/contracts/utils/SafeMath_v2.sol
@@ -71,3 +71,4 @@ contract SafeMath_v2 {
return a < b ? a : b;
}
}
+
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 31c69e8d5..f4d0b5865 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -15,6 +15,7 @@
"migrate:truffle": "npm run build; truffle migrate",
"migrate": "npm run build; node lib/deploy/cli.js migrate",
"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
+ "test:circleci": "yarn test; yarn test:deployer",
"test:deployer": "npm run build; mocha lib/deploy/test/*_test.js"
},
"repository": {