diff --git a/README.md b/README.md index 33638d3..e609189 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Uniswap v2 Smart Contracts +# UniswapV2 + [![CircleCI](https://circleci.com/gh/Uniswap/uniswap-v2-core.svg?style=svg)](https://circleci.com/gh/Uniswap/uniswap-v2-core) ## Local Development @@ -6,23 +7,25 @@ The following assumes the use of `node@^10`. ### Clone Repository + ``` git clone https://github.com/Uniswap/uniswap-v2-core.git cd uniswap-v2-core ``` ### Install Dependencies + ``` yarn ``` ### Compile Contracts and Run Tests + ``` yarn compile yarn test ``` - ## Implementation References - [dapphub math](https://github.com/dapphub/ds-math/blob/de4576712dcf2c5152d16a04e677002d51d46e60/src/math.sol) diff --git a/contracts/ERC20.sol b/contracts/ERC20.sol index d68a2bc..97da5e4 100644 --- a/contracts/ERC20.sol +++ b/contracts/ERC20.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; import "./interfaces/IERC20.sol"; import "./libraries/SafeMath.sol"; diff --git a/contracts/UniswapV2.sol b/contracts/UniswapV2.sol index 7acf0b3..956e81b 100644 --- a/contracts/UniswapV2.sol +++ b/contracts/UniswapV2.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; import "./interfaces/IUniswapV2.sol"; import "./ERC20.sol"; diff --git a/contracts/UniswapV2Factory.sol b/contracts/UniswapV2Factory.sol index e9ab70a..35bb425 100644 --- a/contracts/UniswapV2Factory.sol +++ b/contracts/UniswapV2Factory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; import "./interfaces/IUniswapV2Factory.sol"; import "./interfaces/IUniswapV2.sol"; diff --git a/contracts/interfaces/IERC20.sol b/contracts/interfaces/IERC20.sol index d44aa92..7f54d12 100644 --- a/contracts/interfaces/IERC20.sol +++ b/contracts/interfaces/IERC20.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; interface IERC20 { event Transfer(address indexed from, address indexed to, uint value); diff --git a/contracts/interfaces/IUniswapV2.sol b/contracts/interfaces/IUniswapV2.sol index a012604..6531371 100644 --- a/contracts/interfaces/IUniswapV2.sol +++ b/contracts/interfaces/IUniswapV2.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; interface IUniswapV2 { event Make(address indexed sender, uint amount0, uint amount1); diff --git a/contracts/interfaces/IUniswapV2Factory.sol b/contracts/interfaces/IUniswapV2Factory.sol index e16409e..040aa22 100644 --- a/contracts/interfaces/IUniswapV2Factory.sol +++ b/contracts/interfaces/IUniswapV2Factory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; interface IUniswapV2Factory { event ExchangeCreated(address indexed token0, address indexed token1, address exchange, uint256); diff --git a/contracts/libraries/Math.sol b/contracts/libraries/Math.sol index 434100d..e861163 100644 --- a/contracts/libraries/Math.sol +++ b/contracts/libraries/Math.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; library Math { function min(uint x, uint y) internal pure returns (uint z) { diff --git a/contracts/libraries/SafeMath.sol b/contracts/libraries/SafeMath.sol index fc312a9..347efbd 100644 --- a/contracts/libraries/SafeMath.sol +++ b/contracts/libraries/SafeMath.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; library SafeMath { function add(uint x, uint y) internal pure returns (uint z) { diff --git a/contracts/libraries/UQ112x112.sol b/contracts/libraries/UQ112x112.sol index ac2f1b5..6fe5ad5 100644 --- a/contracts/libraries/UQ112x112.sol +++ b/contracts/libraries/UQ112x112.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.14; +pragma solidity 0.5.15; library UQ112x112 { uint224 constant Q112 = 2**112; diff --git a/package.json b/package.json index 2e0f22c..f82a468 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "node": "^10" }, "dependencies": { - "solc": "0.5.14" + "solc": "0.5.15" }, "devDependencies": { "@types/chai": "^4.2.6", diff --git a/yarn.lock b/yarn.lock index d7e935b..bd9ce16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6019,10 +6019,10 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -solc@0.5.14: - version "0.5.14" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.14.tgz#7c3ecb2441ac10a15cdfd39207372eb63f2bd00c" - integrity sha512-I/MCeOKjnLXxcD65wA+E37BxdERoAYoLeyJ5GnXFijICLmvhzt0xz59R92Zw3TPyJYnHSErKBYpMsfnZVyQJaQ== +solc@0.5.15: + version "0.5.15" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.15.tgz#f674ce93d4d04a86b65a4393657edf03b2f26028" + integrity sha512-uI+7XtBu/0CXRc8IMjzxbh0haLwaBF32VxAkkks06zEk+mVcsQbHdjvojXX6zQYtZVuXdVYPVccoIjEhvvqKnQ== dependencies: command-exists "^1.2.8" commander "3.0.2"