diff --git a/contracts/Bounty.sol b/contracts/Bounty.sol index f5faff6e3..12e25181c 100644 --- a/contracts/Bounty.sol +++ b/contracts/Bounty.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import './PullPayment.sol'; import './Killable.sol'; diff --git a/contracts/ERC20.sol b/contracts/ERC20.sol index 42b65a617..9d32c69fd 100644 --- a/contracts/ERC20.sol +++ b/contracts/ERC20.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; // see https://github.com/ethereum/EIPs/issues/20 diff --git a/contracts/Killable.sol b/contracts/Killable.sol index c5f0a3641..485576d76 100644 --- a/contracts/Killable.sol +++ b/contracts/Killable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import "./Ownable.sol"; /* diff --git a/contracts/LimitFunds.sol b/contracts/LimitFunds.sol index 5f3200c33..303444abc 100644 --- a/contracts/LimitFunds.sol +++ b/contracts/LimitFunds.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; contract LimitFunds { uint LIMIT = 5000; diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index 608bba8f9..5e1a61e11 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; contract Migrations { address public owner; uint public last_completed_migration; diff --git a/contracts/Ownable.sol b/contracts/Ownable.sol index 8ec50c945..6da95fb74 100644 --- a/contracts/Ownable.sol +++ b/contracts/Ownable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; /* * Ownable diff --git a/contracts/PullPayment.sol b/contracts/PullPayment.sol index b8d094455..c05f99caf 100644 --- a/contracts/PullPayment.sol +++ b/contracts/PullPayment.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; /* * PullPayment * Base contract supporting async send for pull payments. diff --git a/contracts/Rejector.sol b/contracts/Rejector.sol deleted file mode 100644 index 05525d5e9..000000000 --- a/contracts/Rejector.sol +++ /dev/null @@ -1,9 +0,0 @@ -pragma solidity ^0.4.0; -/* - * Rejector - * Base contract for rejecting direct deposits. - * Fallback function throws immediately. - */ -contract Rejector { - function() { throw; } -} diff --git a/contracts/SafeMath.sol b/contracts/SafeMath.sol index 2d4bebf77..16e8dae76 100644 --- a/contracts/SafeMath.sol +++ b/contracts/SafeMath.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; /** * Math operations with safety checks diff --git a/contracts/StandardToken.sol b/contracts/StandardToken.sol index 69b8e186f..9fe80f7d8 100644 --- a/contracts/StandardToken.sol +++ b/contracts/StandardToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import './ERC20.sol'; import './SafeMath.sol'; diff --git a/contracts/Stoppable.sol b/contracts/Stoppable.sol index d008e7b3f..ad48f6bc5 100644 --- a/contracts/Stoppable.sol +++ b/contracts/Stoppable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import "./Ownable.sol"; /* diff --git a/contracts/examples/BadArrayUse.sol b/contracts/examples/BadArrayUse.sol index d76160dfd..d5c1c7b7b 100644 --- a/contracts/examples/BadArrayUse.sol +++ b/contracts/examples/BadArrayUse.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../PullPayment.sol'; // UNSAFE CODE, DO NOT USE! diff --git a/contracts/examples/BadFailEarly.sol b/contracts/examples/BadFailEarly.sol index 801ed4754..0ad95a92e 100644 --- a/contracts/examples/BadFailEarly.sol +++ b/contracts/examples/BadFailEarly.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; // UNSAFE CODE, DO NOT USE! contract BadFailEarly { diff --git a/contracts/examples/BadPushPayments.sol b/contracts/examples/BadPushPayments.sol index c8d6b9d19..510b39473 100644 --- a/contracts/examples/BadPushPayments.sol +++ b/contracts/examples/BadPushPayments.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; // UNSAFE CODE, DO NOT USE! contract BadPushPayments { diff --git a/contracts/examples/GoodArrayUse.sol b/contracts/examples/GoodArrayUse.sol index 150eb6ba0..ce450293e 100644 --- a/contracts/examples/GoodArrayUse.sol +++ b/contracts/examples/GoodArrayUse.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../PullPayment.sol'; contract GoodArrayUse is PullPayment { diff --git a/contracts/examples/GoodFailEarly.sol b/contracts/examples/GoodFailEarly.sol index 1dc1b8d32..7a3ec9e60 100644 --- a/contracts/examples/GoodFailEarly.sol +++ b/contracts/examples/GoodFailEarly.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; contract GoodFailEarly { diff --git a/contracts/examples/GoodPullPayments.sol b/contracts/examples/GoodPullPayments.sol index 6a03bbc02..9236d0a4f 100644 --- a/contracts/examples/GoodPullPayments.sol +++ b/contracts/examples/GoodPullPayments.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; contract GoodPullPayments { address highestBidder; uint highestBid; diff --git a/contracts/examples/ProofOfExistence.sol b/contracts/examples/ProofOfExistence.sol index 95f2412cb..a4ec0d45f 100644 --- a/contracts/examples/ProofOfExistence.sol +++ b/contracts/examples/ProofOfExistence.sol @@ -1,12 +1,10 @@ -pragma solidity ^0.4.0; - -import "../Rejector.sol"; +pragma solidity ^0.4.4; /* * Proof of Existence example contract * see https://medium.com/zeppelin-blog/the-hitchhikers-guide-to-smart-contracts-in-ethereum-848f08001f05 */ -contract ProofOfExistence is Rejector { +contract ProofOfExistence { mapping (bytes32 => bool) public proofs; diff --git a/contracts/examples/PullPaymentBid.sol b/contracts/examples/PullPaymentBid.sol index 5cf4fe578..01c91c991 100644 --- a/contracts/examples/PullPaymentBid.sol +++ b/contracts/examples/PullPaymentBid.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../PullPayment.sol'; diff --git a/contracts/examples/StoppableBid.sol b/contracts/examples/StoppableBid.sol index fb61905a0..0edbd8b3e 100644 --- a/contracts/examples/StoppableBid.sol +++ b/contracts/examples/StoppableBid.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../PullPayment.sol'; import '../Stoppable.sol'; diff --git a/contracts/test-helpers/InsecureTargetMock.sol b/contracts/test-helpers/InsecureTargetMock.sol index 0db1ee180..f0d6e2883 100644 --- a/contracts/test-helpers/InsecureTargetMock.sol +++ b/contracts/test-helpers/InsecureTargetMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; contract InsecureTargetMock { function checkInvariant() returns(bool){ diff --git a/contracts/test-helpers/PullPaymentMock.sol b/contracts/test-helpers/PullPaymentMock.sol index 51cb3e107..0c8c3d943 100644 --- a/contracts/test-helpers/PullPaymentMock.sol +++ b/contracts/test-helpers/PullPaymentMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../PullPayment.sol'; // mock class using PullPayment diff --git a/contracts/test-helpers/SecureTargetMock.sol b/contracts/test-helpers/SecureTargetMock.sol index 4c7da0093..e571ae394 100644 --- a/contracts/test-helpers/SecureTargetMock.sol +++ b/contracts/test-helpers/SecureTargetMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; contract SecureTargetMock { function checkInvariant() returns(bool){ diff --git a/contracts/test-helpers/StandardTokenMock.sol b/contracts/test-helpers/StandardTokenMock.sol index 38be987bd..794d78090 100644 --- a/contracts/test-helpers/StandardTokenMock.sol +++ b/contracts/test-helpers/StandardTokenMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../StandardToken.sol'; // mock class using StandardToken diff --git a/contracts/test-helpers/StoppableMock.sol b/contracts/test-helpers/StoppableMock.sol index e7b1e74a1..6d3464bdf 100644 --- a/contracts/test-helpers/StoppableMock.sol +++ b/contracts/test-helpers/StoppableMock.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import '../Stoppable.sol'; // mock class using Stoppable diff --git a/contracts/token/CrowdsaleToken.sol b/contracts/token/CrowdsaleToken.sol index 6d748f421..1172efe5d 100644 --- a/contracts/token/CrowdsaleToken.sol +++ b/contracts/token/CrowdsaleToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import "../StandardToken.sol"; diff --git a/contracts/token/SimpleToken.sol b/contracts/token/SimpleToken.sol index 917a226cb..3b115a6fd 100644 --- a/contracts/token/SimpleToken.sol +++ b/contracts/token/SimpleToken.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import "../StandardToken.sol"; diff --git a/test/TestOwnable.sol b/test/TestOwnable.sol index 1a5433598..cb3cbcf21 100644 --- a/test/TestOwnable.sol +++ b/test/TestOwnable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.0; +pragma solidity ^0.4.4; import "truffle/Assert.sol"; import "truffle/DeployedAddresses.sol"; import "../contracts/Ownable.sol";