Merge pull request #63 from aquiladev/master

Use openzeppelin contracts with alias
unstoppabledomains · May 30, 2023 · e6e2fec · e6e2fec
2 parents 3930faa + b0311b2
commit e6e2fec
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 19 deletions.
diff --git a/contracts/CNSRegistry.sol b/contracts/CNSRegistry.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.5.12;
 
 import "./ICNSRegistry.sol";
-import "@openzeppelin/contracts/token/ERC721/ERC721Burnable.sol";
+import "@openzeppelin/contracts-2.3/token/ERC721/ERC721Burnable.sol";
 import "./util/ControllerRole.sol";
 
 // solium-disable no-empty-blocks,error-reason

diff --git a/contracts/ICNSRegistry.sol b/contracts/ICNSRegistry.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.5.12;
 
-import "@openzeppelin/contracts/token/ERC721/IERC721Metadata.sol";
+import "@openzeppelin/contracts-2.3/token/ERC721/IERC721Metadata.sol";
 
 contract ICNSRegistry is IERC721Metadata {
 

diff --git a/contracts/ProxyReader.sol b/contracts/ProxyReader.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.5.12;
 pragma experimental ABIEncoderV2;
 
-import '@openzeppelin/contracts/introspection/ERC165.sol';
+import '@openzeppelin/contracts-2.3/introspection/ERC165.sol';
 
 import './IRegistryReader.sol';
 import './IResolverReader.sol';

diff --git a/contracts/controllers/MintingController.sol b/contracts/controllers/MintingController.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.5.12;
 
-import "@openzeppelin/contracts/access/roles/MinterRole.sol";
+import "@openzeppelin/contracts-2.3/access/roles/MinterRole.sol";
 import "./IMintingController.sol";
 import "../CNSRegistry.sol";
 

diff --git a/contracts/controllers/SignatureController.sol b/contracts/controllers/SignatureController.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.5.12;
 
 import "./ISignatureController.sol";
-import '@openzeppelin/contracts/cryptography/ECDSA.sol';
+import '@openzeppelin/contracts-2.3/cryptography/ECDSA.sol';
 import "../CNSRegistry.sol";
 import "../util/SignatureUtil.sol";
 

diff --git a/contracts/controllers/URIPrefixController.sol b/contracts/controllers/URIPrefixController.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.5.12;
 
-import "@openzeppelin/contracts/access/roles/WhitelistedRole.sol";
+import "@openzeppelin/contracts-2.3/access/roles/WhitelistedRole.sol";
 import "./IURIPrefixController.sol";
 import "../CNSRegistry.sol";
 

diff --git a/contracts/operators/TwitterValidationOperator.sol b/contracts/operators/TwitterValidationOperator.sol
@@ -1,9 +1,9 @@
 pragma solidity 0.5.12;
 pragma experimental ABIEncoderV2;
 
-import "@openzeppelin/contracts/access/roles/WhitelistedRole.sol";
-import "@openzeppelin/contracts/access/roles/CapperRole.sol";
-import "@openzeppelin/contracts/math/SafeMath.sol";
+import "@openzeppelin/contracts-2.3/access/roles/WhitelistedRole.sol";
+import "@openzeppelin/contracts-2.3/access/roles/CapperRole.sol";
+import "@openzeppelin/contracts-2.3/math/SafeMath.sol";
 import "@chainlink/contracts/src/v0.5/interfaces/LinkTokenInterface.sol";
 import "../util/ERC677Receiver.sol";
 import "../ICNSRegistry.sol";

diff --git a/contracts/test-helpers/LinkTokenMock.sol b/contracts/test-helpers/LinkTokenMock.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.5.12;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20Mintable.sol";
+import "@openzeppelin/contracts-2.3/token/ERC20/ERC20Mintable.sol";
 import "../util/ERC677Receiver.sol";
 
 contract LinkTokenMock is ERC20Mintable {

diff --git a/contracts/test-helpers/RelayTest.sol b/contracts/test-helpers/RelayTest.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.5.12;
 
-import '@openzeppelin/contracts/cryptography/ECDSA.sol';
+import '@openzeppelin/contracts-2.3/cryptography/ECDSA.sol';
 
 // {
 // 	"6d4ce63c": "get()",

diff --git a/contracts/util/BulkWhitelistedRole.sol b/contracts/util/BulkWhitelistedRole.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.5.12;
 
-import "@openzeppelin/contracts/access/Roles.sol";
-import "@openzeppelin/contracts/access/roles/WhitelistedRole.sol";
+import "@openzeppelin/contracts-2.3/access/Roles.sol";
+import "@openzeppelin/contracts-2.3/access/roles/WhitelistedRole.sol";
 
 /**
  * @title BulkWhitelistedRole

diff --git a/contracts/util/ControllerRole.sol b/contracts/util/ControllerRole.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.5.12;
 
-import "@openzeppelin/contracts/access/Roles.sol";
+import "@openzeppelin/contracts-2.3/access/Roles.sol";
 
 // solium-disable error-reason
 

diff --git a/contracts/util/SignatureUtil.sol b/contracts/util/SignatureUtil.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.5.12;
 
 import '../CNSRegistry.sol';
-import '@openzeppelin/contracts/cryptography/ECDSA.sol';
+import '@openzeppelin/contracts-2.3/cryptography/ECDSA.sol';
 
 // solium-disable error-reason
 

diff --git a/contracts/util/WhitelistedMinter.sol b/contracts/util/WhitelistedMinter.sol
@@ -1,7 +1,7 @@
 pragma solidity 0.5.12;
 pragma experimental ABIEncoderV2;
 
-import '@openzeppelin/contracts/cryptography/ECDSA.sol';
+import '@openzeppelin/contracts-2.3/cryptography/ECDSA.sol';
 import "./BulkWhitelistedRole.sol";
 import "../controllers/IMintingController.sol";
 import "../controllers/MintingController.sol";

diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
   },
   "devDependencies": {
     "@chainlink/contracts": "^0.0.10",
-    "@openzeppelin/contracts": "2.3.0",
     "@truffle/hdwallet-provider": "^1.1.0",
     "@types/mocha": "^5.2.7",
     "@types/node-fetch": "^2.5.10",
@@ -67,5 +66,7 @@
     "web3": "1",
     "yargs": "^14.0.0"
   },
-  "dependencies": {}
+  "dependencies": {
+    "@openzeppelin/contracts-2.3": "npm:@openzeppelin/contracts@2.3.0"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -211,7 +211,7 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@openzeppelin/contracts@2.3.0":
+"@openzeppelin/contracts-2.3@npm:@openzeppelin/contracts@2.3.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-2.3.0.tgz#043961a6e37b87e0eb80647c7528a7c62c41361f"
   integrity sha512-lf8C3oULQAnsu3OTRP4tP5/ddfil6l65Lg3JQCwAIgc99vZ1jz5qeBoETGGGmczxt+bIyMI06WPP2apC74EZag==