updates zepplin upgrade repo reference

Author: aalavandhan

.solcover.js

@@ -1,6 +1,6 @@
 module.exports = {
   skipFiles: ['_external', '_mocks'],
   mocha: {
-    timeout: 100000
+    timeout: 100000,
   },
 };

contracts/satellite-chain/xc-ampleforth/XCAmple.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.6.12;
 
-import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";
-import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 /**
  * @title XC(cross-chain)Ample ERC20 token
@@ -15,9 +15,9 @@ import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
  *      Additionally, the XCAmple contract lets the XCAmpleController
  *      `mint` or `burn` tokens.
  */
-contract XCAmple is IERC20, OwnableUpgradeSafe {
+contract XCAmple is IERC20Upgradeable, OwnableUpgradeable {
     // PLEASE EXERCISE CAUTION BEFORE CHANGING ANY ACCOUNTING OR MATH
-    using SafeMath for uint256;
+    using SafeMathUpgradeable for uint256;
 
     event LogRebase(uint256 indexed epoch, uint256 globalAMPLSupply);
     event ControllerUpdated(address controller);

contracts/satellite-chain/xc-ampleforth/XCAmpleController.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.6.12;
 
-import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";
-import "@openzeppelin/contracts-ethereum-package/contracts/math/SignedSafeMath.sol";
-import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/math/SignedSafeMathUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 import "./UInt256Lib.sol";
 import "../../_interfaces/IXCAmple.sol";
@@ -17,9 +17,9 @@ import "../../_interfaces/IBatchTxExecutor.sol";
  *      rebase on XCAmple, based on updated AMPL supply reported through
  *      the bridge gateway.
  */
-contract XCAmpleController is OwnableUpgradeSafe {
-    using SafeMath for uint256;
-    using SignedSafeMath for int256;
+contract XCAmpleController is OwnableUpgradeable {
+    using SafeMathUpgradeable for uint256;
+    using SignedSafeMathUpgradeable for int256;
     using UInt256Lib for uint256;
 
     event GatewayMint(

package.json

@@ -19,10 +19,10 @@
   ],
   "dependencies": {
     "@openzeppelin/contracts": "^3.2.0",
-    "@openzeppelin/contracts-ethereum-package": "^3.0.0",
+    "@openzeppelin/contracts-upgradeable": "^3.3.0",
     "chainbridge-solidity": "https://github.com/ChainSafe/chainbridge-solidity#master",
-    "uFragments": "https://github.com/ampleforth/uFragments#master",
-    "market-oracle": "https://github.com/ampleforth/market-oracle#master"
+    "market-oracle": "https://github.com/ampleforth/market-oracle#master",
+    "uFragments": "https://github.com/ampleforth/uFragments#master"
   },
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.1",

yarn.lock

@@ -751,6 +751,11 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-ethereum-package/-/contracts-ethereum-package-3.0.0.tgz#d5db971a177c3b37733db2ee4ebdb79c67575d64"
   integrity sha512-Xg33RtX7FGbSK/YnroLhcGNAvH30/C84NRW8KvbSdXXYiLA8YqM1bOA9sAeLjmQxXqYUn/YL4AUVTgDnG51NOw==
 
+"@openzeppelin/contracts-upgradeable@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-3.3.0.tgz#a536c6ff107d21319490e6cb699e555a3edcf6ea"
+  integrity sha512-kJeNuKauR4xH52Yo3GdXXAOW4CWyWdm7VXcJFe63G8TRb45ISSnkt/gXwUa8zzEYqokQrwNZYoH/iGYfUlp6wA==
+
 "@openzeppelin/contracts@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.2.0.tgz#3e6b3a7662d8ed64271ade96ef42655db983fd9d"