aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-02-02 10:43:04 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-02-03 01:41:19 +0800
commit05aae368132a81ddb9fd6a04ac5b0ff1cbb24691 (patch)
tree6fbea107aa30cbef31329bfcb68223dd8ab142d8 /packages/contracts/src
parentd5d6079b673d0a6d311f349dba291da18c846d9e (diff)
downloaddexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.tar
dexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.tar.gz
dexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.tar.bz2
dexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.tar.lz
dexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.tar.xz
dexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.tar.zst
dexon-sol-tools-05aae368132a81ddb9fd6a04ac5b0ff1cbb24691.zip
Update contract versions, fix tests
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/current/multisig/MultiSigWallet/MultiSigWallet.sol2
-rw-r--r--packages/contracts/src/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol2
-rw-r--r--packages/contracts/src/current/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol2
-rw-r--r--packages/contracts/src/current/protocol/Exchange/Exchange.sol2
-rw-r--r--packages/contracts/src/previous/Ownable/Ownable_v1.sol2
5 files changed, 5 insertions, 5 deletions
diff --git a/packages/contracts/src/current/multisig/MultiSigWallet/MultiSigWallet.sol b/packages/contracts/src/current/multisig/MultiSigWallet/MultiSigWallet.sol
index ae7ef06fd..997bb86c0 100644
--- a/packages/contracts/src/current/multisig/MultiSigWallet/MultiSigWallet.sol
+++ b/packages/contracts/src/current/multisig/MultiSigWallet/MultiSigWallet.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.11;
+pragma solidity ^0.4.10;
/// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.
/// @author Stefan George - <stefan.george@consensys.net>
diff --git a/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol b/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol
index 46c152035..a545d9813 100644
--- a/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol
+++ b/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol
@@ -16,7 +16,7 @@
*/
-pragma solidity ^0.4.11;
+pragma solidity ^0.4.10;
import { MultiSigWallet } from "../MultiSigWallet/MultiSigWallet.sol";
diff --git a/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol b/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
index 8cc8372c1..3c6a3d2ef 100644
--- a/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
+++ b/packages/contracts/src/current/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
@@ -16,7 +16,7 @@
*/
-pragma solidity ^0.4.11;
+pragma solidity ^0.4.10;
import { MultiSigWalletWithTimeLock } from "../MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol";
diff --git a/packages/contracts/src/current/protocol/Exchange/Exchange.sol b/packages/contracts/src/current/protocol/Exchange/Exchange.sol
index 12ac8141f..8dacf797c 100644
--- a/packages/contracts/src/current/protocol/Exchange/Exchange.sol
+++ b/packages/contracts/src/current/protocol/Exchange/Exchange.sol
@@ -16,7 +16,7 @@
*/
-pragma solidity ^0.4.11;
+pragma solidity ^0.4.14;
import { TokenTransferProxy } from "../TokenTransferProxy/TokenTransferProxy.sol";
import { Token_v1 as Token } from "../../../previous/Token/Token_v1.sol";
diff --git a/packages/contracts/src/previous/Ownable/Ownable_v1.sol b/packages/contracts/src/previous/Ownable/Ownable_v1.sol
index 3630678f7..c87438fa4 100644
--- a/packages/contracts/src/previous/Ownable/Ownable_v1.sol
+++ b/packages/contracts/src/previous/Ownable/Ownable_v1.sol
@@ -10,7 +10,7 @@ pragma solidity ^0.4.11;
contract Ownable_v1 {
address public owner;
- function Ownable() {
+ function Ownable_v1() {
owner = msg.sender;
}