Code cleanup

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.js

@@ -14,7 +14,7 @@ module.exports = {
     contract: true,
     expect: true,
     Promise: true,
-    web3: true,
+    hre: true,
   },
   plugins: ['prettier', 'spellcheck', 'chai-friendly'],
   rules: {
@@ -86,13 +86,15 @@ module.exports = {
           'initializer',
           'nomiclabs',
           'upgradable',
+          'upgradeability',
           'ethersproject',
           'hexlify',
           'utf8',
           'Utf8Bytes',
           'keccak256',
           'Sighash',
           'ecsign',
+          'rollup',
 
           // shorthand
           'args',
@@ -109,6 +111,9 @@ module.exports = {
           'perc',
           'opcode',
           'aprox',
+          'impl',
+          'param',
+          'desc',
 
           // project-specific
           'rebase',
@@ -159,6 +164,12 @@ module.exports = {
           'dev3',
           'avax',
           'arbitrum',
+          'mumbai',
+          'maticjs',
+          'maticnetwork',
+          'passphrase',
+          'erc721',
+          'batcher',
 
           // names
           'nithin',

contracts/_external/uFragments/Orchestrator.sol → contracts/_external/ampleforth-contracts/Orchestrator.sol

@@ -2,4 +2,4 @@
 // Importing uFragments contract dependencies to be compiled for integration tests
 pragma solidity 0.7.6;
 
-import "uFragments/contracts/Orchestrator.sol";
+import "ampleforth-contracts/contracts/Orchestrator.sol";

contracts/_external/uFragments/UFragments.sol → contracts/_external/ampleforth-contracts/UFragments.sol

@@ -2,4 +2,4 @@
 // Importing uFragments contract dependencies to be compiled for integration tests
 pragma solidity 0.7.6;
 
-import "uFragments/contracts/UFragments.sol";
+import "ampleforth-contracts/contracts/UFragments.sol";

contracts/_external/uFragments/UFragmentsPolicy.sol → contracts/_external/ampleforth-contracts/UFragmentsPolicy.sol

@@ -2,4 +2,4 @@
 // Importing uFragments contract dependencies to be compiled for integration tests
 pragma solidity 0.7.6;
 
-import "uFragments/contracts/UFragmentsPolicy.sol";
+import "ampleforth-contracts/contracts/UFragmentsPolicy.sol";

contracts/_interfaces/IXCAmple.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-import "uFragments/contracts/interfaces/IAMPL.sol";
+import "ampleforth-contracts/contracts/interfaces/IAMPL.sol";
 
 interface IXCAmple is IAMPL {
     function globalAMPLSupply() external view returns (uint256);

contracts/_mocks/MockERC20.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "openzeppelin-contracts-3.4.1/contracts/token/ERC20/ERC20.sol";
 
 contract MockERC20 is ERC20 {
     constructor(string memory name, string memory symbol) public ERC20(name, symbol) {

contracts/_test/UFragmentsTestnet.sol

@@ -2,7 +2,7 @@
 // Importing uFragments contract dependencies to be compiled for integration tests
 pragma solidity 0.7.6;
 
-import {UFragments} from "uFragments/contracts/UFragments.sol";
+import {UFragments} from "ampleforth-contracts/contracts/UFragments.sol";
 
 contract UFragmentsTestnet is UFragments {
     event Result(bool result, bytes reason);

contracts/_utilities/BatchTxExecutor.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
+import {Ownable} from "openzeppelin-contracts-3.4.1/contracts/access/Ownable.sol";
 
 /**
  * @title BatchTxExecutor

contracts/base-chain/TokenVault.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
+import {Ownable} from "openzeppelin-contracts-3.4.1/contracts/access/Ownable.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
+import {IERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/SafeERC20.sol";
 
 /**
  * @title TokenVault

contracts/base-chain/bridge-gateways/AMPLArbitrumGateway.sol

@@ -2,17 +2,17 @@
 pragma solidity 0.6.11;
 pragma experimental ABIEncoderV2;
 
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
-import {Initializable} from "@openzeppelin/contracts/proxy/Initializable.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
+import {Initializable} from "openzeppelin-contracts-3.4.1/contracts/proxy/Initializable.sol";
 // solhint-disable-next-line max-line-length
 import {GatewayMessageHandler} from "arb-bridge-peripherals/contracts/tokenbridge/libraries/gateway/GatewayMessageHandler.sol";
 import {L1ArbitrumMessenger} from "arb-bridge-peripherals/contracts/tokenbridge/ethereum/L1ArbitrumMessenger.sol";
 
 // solhint-disable-next-line max-line-length
 import {IArbitrumBCRebaseGateway, IArbitrumBCTransferGateway, IArbitrumSCRebaseGateway, IArbitrumSCTransferGateway} from "../../_interfaces/bridge-gateways/IArbitrumGateway.sol";
-import {IAmpleforth} from "uFragments/contracts/interfaces/IAmpleforth.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
+import {IAmpleforth} from "ampleforth-contracts/contracts/interfaces/IAmpleforth.sol";
+import {IERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/SafeERC20.sol";
 import {ITokenVault} from "../../_interfaces/ITokenVault.sol";
 
 /// @dev Abstract l2 gateway contarct implementation to define function selectors

contracts/base-chain/bridge-gateways/AMPLChainBridgeGateway.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {Ownable} from "openzeppelin-contracts-3.4.1/contracts/access/Ownable.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
 
 // solhint-disable-next-line max-line-length
 import {IChainBridgeBCRebaseGateway, IChainBridgeBCTransferGateway} from "../../_interfaces/bridge-gateways/IChainBridgeGateway.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {IAmpleforth} from "uFragments/contracts/interfaces/IAmpleforth.sol";
+import {IERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/IERC20.sol";
+import {IAmpleforth} from "ampleforth-contracts/contracts/interfaces/IAmpleforth.sol";
 import {ITokenVault} from "../../_interfaces/ITokenVault.sol";
 
 /**

contracts/base-chain/bridge-gateways/AMPLMaticRebaseGateway.sol

@@ -4,8 +4,8 @@ pragma solidity 0.7.3;
 import {FxBaseRootTunnel} from "fx-portal/contracts/tunnel/FxBaseRootTunnel.sol";
 
 import {IMaticBCRebaseGateway} from "../../_interfaces/bridge-gateways/IMaticGateway.sol";
-import {IAmpleforth} from "uFragments/contracts/interfaces/IAmpleforth.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IAmpleforth} from "ampleforth-contracts/contracts/interfaces/IAmpleforth.sol";
+import {IERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/IERC20.sol";
 
 /**
  * @title AMPLMaticRebaseGateway: AMPL-Matic Rebase Gateway Contract

contracts/base-chain/bridge-gateways/AMPLMaticTransferGateway.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
 
 import {FxBaseRootTunnel} from "fx-portal/contracts/tunnel/FxBaseRootTunnel.sol";
 
 import {IMaticTransferGateway} from "../../_interfaces/bridge-gateways/IMaticGateway.sol";
 import {ITokenVault} from "../../_interfaces/ITokenVault.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "openzeppelin-contracts-3.4.1/contracts/token/ERC20/IERC20.sol";
 
 /**
  * @title AMPLMaticTransferGateway: AMPL-Matic Transfer Gateway Contract

contracts/satellite-chain/bridge-gateways/ArbitrumXCAmpleGateway.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.6.11;
 pragma experimental ABIEncoderV2;
 
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
-import {Initializable} from "@openzeppelin/contracts/proxy/Initializable.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
+import {Initializable} from "openzeppelin-contracts-3.4.1/contracts/proxy/Initializable.sol";
 
 // solhint-disable-next-line max-line-length
 import {GatewayMessageHandler} from "arb-bridge-peripherals/contracts/tokenbridge/libraries/gateway/GatewayMessageHandler.sol";

contracts/satellite-chain/bridge-gateways/ChainBridgeXCAmpleGateway.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {Ownable} from "openzeppelin-contracts-3.4.1/contracts/access/Ownable.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
 
 // solhint-disable-next-line max-line-length
 import {IChainBridgeSCRebaseGateway, IChainBridgeSCTransferGateway} from "../../_interfaces/bridge-gateways/IChainBridgeGateway.sol";

contracts/satellite-chain/bridge-gateways/MaticXCAmpleTransferGateway.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {SafeMath} from "openzeppelin-contracts-3.4.1/contracts/math/SafeMath.sol";
 
 import {FxBaseChildTunnel} from "fx-portal/contracts/tunnel/FxBaseChildTunnel.sol";
 

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

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {SafeMathUpgradeable} from "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {SafeMathUpgradeable} from "openzeppelin-contracts-upgradeable-3.3.0/contracts/math/SafeMathUpgradeable.sol";
+import {IERC20Upgradeable} from "openzeppelin-contracts-upgradeable-3.3.0/contracts/token/ERC20/IERC20Upgradeable.sol";
+import {OwnableUpgradeable} from "openzeppelin-contracts-upgradeable-3.3.0/contracts/access/OwnableUpgradeable.sol";
 
 /**
  * @title XC(cross-chain)Ample ERC20 token

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

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.7.3;
 
-import {SafeMathUpgradeable} from "@openzeppelin/contracts-upgradeable/math/SafeMathUpgradeable.sol";
-import {SignedSafeMathUpgradeable} from "@openzeppelin/contracts-upgradeable/math/SignedSafeMathUpgradeable.sol";
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {SafeMathUpgradeable} from "openzeppelin-contracts-upgradeable-3.3.0/contracts/math/SafeMathUpgradeable.sol";
+// solhint-disable-next-line max-line-length
+import {SignedSafeMathUpgradeable} from "openzeppelin-contracts-upgradeable-3.3.0/contracts/math/SignedSafeMathUpgradeable.sol";
+import {OwnableUpgradeable} from "openzeppelin-contracts-upgradeable-3.3.0/contracts/access/OwnableUpgradeable.sol";
 
 import {UInt256Lib} from "./UInt256Lib.sol";
 import {IXCAmple} from "../../_interfaces/IXCAmple.sol";