Updated dependencies and solidity version

vittominacori · Aug 30, 2019 · 6f38c84 · 6f38c84
1 parent 1522d60
commit 6f38c84
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 41 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,7 +6,12 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.sol]
+indent_size = 4
+
+[*.js]
+indent_size = 2
diff --git a/.solcover.js b/.solcover.js
@@ -3,7 +3,7 @@ module.exports = {
     testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage',
     compileCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle compile --network coverage',
     copyPackages: [
-        'openzeppelin-solidity',
+        '@openzeppelin',
     ],
     skipFiles: [
         'mocks'

diff --git a/.solhint.json b/.solhint.json
@@ -5,6 +5,6 @@
     "bracket-align": "off",
     "compiler-fixed": "off",
     "mark-callable-contracts": "off",
-    "compiler-version": ["error", "^0.5.10"]
+    "compiler-version": ["error", "^0.5.11"]
   }
 }
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ npm install erc-payable-token
 ## Usage
 
 ```solidity
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
 import "erc-payable-token/contracts/token/ERC1363/ERC1363.sol";
 

diff --git a/contracts/examples/ERC1363PayableCrowdsale.sol b/contracts/examples/ERC1363PayableCrowdsale.sol
@@ -1,9 +1,9 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
-import "openzeppelin-solidity/contracts/math/SafeMath.sol";
-import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
-import "openzeppelin-solidity/contracts/token/ERC20/SafeERC20.sol";
-import "openzeppelin-solidity/contracts/utils/ReentrancyGuard.sol";
+import "@openzeppelin/contracts/math/SafeMath.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
+import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import "../payment/ERC1363Payable.sol";
 
 /**

diff --git a/contracts/mocks/ERC1363Mock.sol b/contracts/mocks/ERC1363Mock.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
 import "../token/ERC1363/ERC1363.sol";
 

diff --git a/contracts/mocks/ERC1363PayableMock.sol b/contracts/mocks/ERC1363PayableMock.sol
@@ -1,6 +1,6 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
-import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+import "@openzeppelin/contracts/math/SafeMath.sol";
 import "../payment/ERC1363Payable.sol";
 
 // mock class using ERC1363Payable

diff --git a/contracts/mocks/ERC1363ReceiverMock.sol b/contracts/mocks/ERC1363ReceiverMock.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
 import "../token/ERC1363/IERC1363Receiver.sol";
 

diff --git a/contracts/mocks/ERC1363SpenderMock.sol b/contracts/mocks/ERC1363SpenderMock.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
 import "../token/ERC1363/IERC1363Spender.sol";
 

diff --git a/contracts/mocks/ERC20Mock.sol b/contracts/mocks/ERC20Mock.sol
@@ -1,6 +1,6 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
-import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 /**
  * @title ERC20Mock

diff --git a/contracts/payment/ERC1363Payable.sol b/contracts/payment/ERC1363Payable.sol
@@ -1,6 +1,6 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
-import "openzeppelin-solidity/contracts/introspection/ERC165Checker.sol";
+import "@openzeppelin/contracts/introspection/ERC165Checker.sol";
 
 import "../token/ERC1363/IERC1363.sol";
 import "../token/ERC1363/IERC1363Receiver.sol";

diff --git a/contracts/token/ERC1363/ERC1363.sol b/contracts/token/ERC1363/ERC1363.sol
@@ -1,8 +1,8 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
-import "openzeppelin-solidity/contracts/utils/Address.sol";
-import "openzeppelin-solidity/contracts/introspection/ERC165Checker.sol";
-import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts/utils/Address.sol";
+import "@openzeppelin/contracts/introspection/ERC165Checker.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 import "./IERC1363.sol";
 import "./IERC1363Receiver.sol";

diff --git a/contracts/token/ERC1363/IERC1363.sol b/contracts/token/ERC1363/IERC1363.sol
@@ -1,7 +1,7 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
-import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
-import "openzeppelin-solidity/contracts/introspection/ERC165.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/introspection/ERC165.sol";
 
 /**
  * @title IERC1363 Interface

diff --git a/contracts/token/ERC1363/IERC1363Receiver.sol b/contracts/token/ERC1363/IERC1363Receiver.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
 /**
  * @title IERC1363Receiver Interface

diff --git a/contracts/token/ERC1363/IERC1363Spender.sol b/contracts/token/ERC1363/IERC1363Spender.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.11;
 
 /**
  * @title IERC1363Spender Interface

diff --git a/ethpm.json b/ethpm.json
@@ -1,6 +1,6 @@
 {
   "package_name": "erc-payable-token",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "ERC-1363 Payable Token Implementation",
   "authors": [
     "Vittorio Minacori (https://github.com/vittominacori)"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "erc-payable-token",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "ERC-1363 Payable Token Implementation",
   "files": [
     "contracts",
@@ -40,27 +40,27 @@
   },
   "homepage": "https://github.com/vittominacori/erc1363-payable-token",
   "dependencies": {
-    "openzeppelin-solidity": "2.3.0"
+    "@openzeppelin/contracts": "2.3.0"
   },
   "devDependencies": {
     "chai": "^4.2.0",
-    "coveralls": "^3.0.4",
-    "eslint": "^6.0.1",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.18.0",
+    "coveralls": "^3.0.6",
+    "eslint": "^6.2.2",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-mocha-no-only": "^1.1.0",
-    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-node": "^9.2.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-standard": "^4.0.1",
     "ethereumjs-util": "^6.1.0",
     "ethjs-abi": "^0.2.1",
-    "ganache-cli": "^6.4.4",
+    "ganache-cli": "^6.6.0",
     "ganache-cli-coverage": "https://github.com/frangio/ganache-cli/releases/download/v6.4.1-coverage/ganache-cli-coverage-6.4.1.tgz",
-    "openzeppelin-test-helpers": "^0.4.0",
+    "openzeppelin-test-helpers": "^0.4.3",
     "pify": "^4.0.1",
-    "solhint": "^2.1.0",
+    "solhint": "^2.2.0",
     "solidity-coverage": "github:rotcivegaf/solidity-coverage#5875f5b7bc74d447f3312c9c0e9fc7814b482477",
-    "truffle": "^5.0.25",
+    "truffle": "^5.0.34",
     "vuepress": "^0.14.11"
   }
 }
diff --git a/truffle-config.js b/truffle-config.js
@@ -1,7 +1,7 @@
 require('chai/register-should');
 
 const solcStable = {
-  version: '0.5.10',
+  version: '0.5.11',
   settings: {
     optimizer: {
       enabled: true,