From a1c394f5f4f500726b3a5dd884d8f7fb9d2894db Mon Sep 17 00:00:00 2001 From: kongliangzhong Date: Thu, 8 Mar 2018 17:32:08 +0800 Subject: [PATCH] update truffle version to 4.1.3 and solc version to 0.4.19 --- contracts/LoopringProtocol.sol | 2 +- contracts/LoopringProtocolImpl.sol | 2 +- contracts/Migrations.sol | 2 +- contracts/NameRegistry.sol | 2 +- contracts/TokenRegistry.sol | 2 +- contracts/TokenTransferDelegate.sol | 2 +- contracts/TransferableMultsig.sol | 2 +- contracts/lib/Claimable.sol | 4 ++-- contracts/lib/ERC20.sol | 6 +++--- contracts/lib/MathBytes32.sol | 2 +- contracts/lib/MathUint.sol | 2 +- contracts/lib/MathUint8.sol | 2 +- contracts/lib/Ownable.sol | 4 ++-- contracts/test/DummyToken.sol | 2 +- package-lock.json | 27 ++++++++++++++++++++------- package.json | 3 +-- 16 files changed, 39 insertions(+), 27 deletions(-) diff --git a/contracts/LoopringProtocol.sol b/contracts/LoopringProtocol.sol index 770b5302..04d2ad01 100644 --- a/contracts/LoopringProtocol.sol +++ b/contracts/LoopringProtocol.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Loopring Token Exchange Protocol Contract Interface diff --git a/contracts/LoopringProtocolImpl.sol b/contracts/LoopringProtocolImpl.sol index 1527956c..a3d766a1 100644 --- a/contracts/LoopringProtocolImpl.sol +++ b/contracts/LoopringProtocolImpl.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; import "./lib/ERC20.sol"; import "./lib/MathBytes32.sol"; diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index 32d9272d..c495d94d 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.19; contract Migrations { diff --git a/contracts/NameRegistry.sol b/contracts/NameRegistry.sol index b870470e..d38f3a7f 100644 --- a/contracts/NameRegistry.sol +++ b/contracts/NameRegistry.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Ethereum Address Register Contract diff --git a/contracts/TokenRegistry.sol b/contracts/TokenRegistry.sol index 61851bab..49c73c9e 100644 --- a/contracts/TokenRegistry.sol +++ b/contracts/TokenRegistry.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; import "./lib/Claimable.sol"; diff --git a/contracts/TokenTransferDelegate.sol b/contracts/TokenTransferDelegate.sol index 10bffd10..56512cf2 100644 --- a/contracts/TokenTransferDelegate.sol +++ b/contracts/TokenTransferDelegate.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; import "./lib/ERC20.sol"; import "./lib/MathUint.sol"; diff --git a/contracts/TransferableMultsig.sol b/contracts/TransferableMultsig.sol index 7c60fd4b..458a7f45 100644 --- a/contracts/TransferableMultsig.sol +++ b/contracts/TransferableMultsig.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Transferable Multisignature Contract diff --git a/contracts/lib/Claimable.sol b/contracts/lib/Claimable.sol index 21b47609..1f5534a0 100644 --- a/contracts/lib/Claimable.sol +++ b/contracts/lib/Claimable.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; import "./Ownable.sol"; @@ -45,4 +45,4 @@ contract Claimable is Ownable { owner = pendingOwner; pendingOwner = 0x0; } -} \ No newline at end of file +} diff --git a/contracts/lib/ERC20.sol b/contracts/lib/ERC20.sol index 1273ba9e..c50eb61f 100644 --- a/contracts/lib/ERC20.sol +++ b/contracts/lib/ERC20.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title ERC20 Token Interface @@ -23,7 +23,7 @@ pragma solidity 0.4.18; /// @author Daniel Wang - contract ERC20 { uint public totalSupply; - + event Transfer(address indexed from, address indexed to, uint256 value); event Approval(address indexed owner, address indexed spender, uint256 value); @@ -32,4 +32,4 @@ contract ERC20 { function transfer(address to, uint256 value) public returns (bool); function transferFrom(address from, address to, uint256 value) public returns (bool); function approve(address spender, uint256 value) public returns (bool); -} \ No newline at end of file +} diff --git a/contracts/lib/MathBytes32.sol b/contracts/lib/MathBytes32.sol index c18cf5f5..611136e4 100644 --- a/contracts/lib/MathBytes32.sol +++ b/contracts/lib/MathBytes32.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Utility Functions for byte32 diff --git a/contracts/lib/MathUint.sol b/contracts/lib/MathUint.sol index 489af8f7..1693b9a2 100644 --- a/contracts/lib/MathUint.sol +++ b/contracts/lib/MathUint.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Utility Functions for uint diff --git a/contracts/lib/MathUint8.sol b/contracts/lib/MathUint8.sol index 5c1a699b..3ab8ad1c 100644 --- a/contracts/lib/MathUint8.sol +++ b/contracts/lib/MathUint8.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Utility Functions for uint8 diff --git a/contracts/lib/Ownable.sol b/contracts/lib/Ownable.sol index 37240485..009e963d 100644 --- a/contracts/lib/Ownable.sol +++ b/contracts/lib/Ownable.sol @@ -15,7 +15,7 @@ limitations under the License. */ -pragma solidity 0.4.18; +pragma solidity 0.4.19; /// @title Ownable @@ -50,4 +50,4 @@ contract Ownable { OwnershipTransferred(owner, newOwner); owner = newOwner; } -} \ No newline at end of file +} diff --git a/contracts/test/DummyToken.sol b/contracts/test/DummyToken.sol index 65bc96bd..ea8e188c 100644 --- a/contracts/test/DummyToken.sol +++ b/contracts/test/DummyToken.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.19; import "zeppelin-solidity/contracts/token/ERC20/MintableToken.sol"; diff --git a/package-lock.json b/package-lock.json index 94912b28..49567f67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3696,9 +3696,9 @@ "dev": true }, "solc": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.18.tgz", - "integrity": "sha512-Kq+O3PNF9Pfq7fB+lDYAuoqRdghLmZyfngsg0h1Hj38NKAeVHeGPOGeZasn5KqdPeCzbMFvaGyTySxzGv6aXCg==", + "version": "0.4.20", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.20.tgz", + "integrity": "sha512-LrP3Jp4FS3y8sduIR67y8Ss1riR3fggk5sMnx4OSCcU88Ro0e51+KVXyfH3NP6ghLo7COrLx/lGUaDDugCzdgA==", "dev": true, "requires": { "fs-extra": "0.30.0", @@ -4148,14 +4148,14 @@ "dev": true }, "truffle": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.0.1.tgz", - "integrity": "sha512-PybO+GMq3AvsfCWfEx4sbuaJlDL19iR8Ff20cO0TtP599N5JbMLlhwlffvVInPgFjP+F11vjSOYj3hT8fONs5A==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.1.3.tgz", + "integrity": "sha512-BE9SMYRp/KH/xlQTOGmbV5wjju/456Fg/pS5Qez7UTHaJDQHF1OF8l4sWyMhs0TNTgRXwXLwkIBSeZA7QxHjkQ==", "dev": true, "requires": { "mocha": "3.5.3", "original-require": "1.0.1", - "solc": "0.4.18" + "solc": "0.4.19" }, "dependencies": { "commander": { @@ -4219,6 +4219,19 @@ "supports-color": "3.1.2" } }, + "solc": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.19.tgz", + "integrity": "sha512-hvi/vi9rQcB73poRLoLRfQIYKwmdhrNbZlOOFCGd5v58gEsYEUr3+oHPSXhyk4CFNchWC2ojpMYrHDJNm0h4jQ==", + "dev": true, + "requires": { + "fs-extra": "0.30.0", + "memorystream": "0.3.1", + "require-from-string": "1.2.1", + "semver": "5.4.1", + "yargs": "4.8.1" + } + }, "supports-color": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", diff --git a/package.json b/package.json index 77416dd2..b7c9e3ff 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,7 @@ "dirty-chai": "^2.0.0", "chai": "^2.2.1", "ganache-cli": "^6.0.3", - "truffle": "4.0.1", - "solc": "0.4.18", + "truffle": "4.1.3", "solium": "^1.1.5", "typescript": "2.4.2", "tslint": "5.8.0",