Merge pull request #58 from ampleforth/meter-deployment

Deploy to meter chain

Author: aalavandhan

.eslintrc.js

@@ -156,6 +156,7 @@ module.exports = {
           'matic',
           'dev1',
           'dev2',
+          'avax',
 
           // names
           'nithin',

README.md

@@ -43,6 +43,13 @@ token: 0x027dbcA046ca156De9622cD1e2D907d375e53aa7
 controller: 0x24232ccAf8bB87908C419aD7dDCca8cc9e74746d
 rebaseRelayer: 0xE3a0B70676ed6e1947140Ff0b332cAe7d7f0364B
 
+# Meter (controlled by Ampleforth Bridge DAO on METER)
+# TODO: yet to transfer ownership
+owner: 0x240aa3CA55D3f8dF80936a84Ff076bF9A09370Fa
+token: 0xc67238827da94B15F6bA10F3d35f690809919F75
+controller: 0x0AF32F7B0733DBFe59E52712c3fBF2d1B4ebd00f
+rebaseRelayer: 0x4960382cA3151Df595b944731304F71Df7eDb35A
+
 # Matic / Polygon (controlled by Ampleforth Bridge DAO on Matic)
 owner: 0x5d96A65E51A78C511C545a0247eb2d006912b636
 token: 0xc67238827da94B15F6bA10F3d35f690809919F75

contracts/_mocks/MockRebaseRelayer.sol

@@ -2,7 +2,11 @@
 pragma solidity 0.7.3;
 
 contract MockRebaseRelayer {
-    enum State {Failure, Revert, Success}
+    enum State {
+        Failure,
+        Revert,
+        Success
+    }
     State private state;
 
     function executeAll() external view returns (bool) {

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

@@ -5,9 +5,7 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
 
 import {ChainBridgeRebaseGateway} from "../../base-bridge-gateways/ChainBridgeRebaseGateway.sol";
-import {
-    ChainBridgeTransferGateway
-} from "../../base-bridge-gateways/ChainBridgeTransferGateway.sol";
+import {ChainBridgeTransferGateway} from "../../base-bridge-gateways/ChainBridgeTransferGateway.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IAmpleforth} from "uFragments/contracts/interfaces/IAmpleforth.sol";

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

@@ -5,9 +5,7 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
 
 import {ChainBridgeRebaseGateway} from "../../base-bridge-gateways/ChainBridgeRebaseGateway.sol";
-import {
-    ChainBridgeTransferGateway
-} from "../../base-bridge-gateways/ChainBridgeTransferGateway.sol";
+import {ChainBridgeTransferGateway} from "../../base-bridge-gateways/ChainBridgeTransferGateway.sol";
 
 import {IXCAmpleController} from "../../_interfaces/IXCAmpleController.sol";
 import {IXCAmpleControllerGateway} from "../../_interfaces/IXCAmpleControllerGateway.sol";

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

@@ -1,15 +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/math/SafeMathUpgradeable.sol";
+import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 /**
  * @title XC(cross-chain)Ample ERC20 token
@@ -79,12 +73,14 @@ contract XCAmple is IERC20Upgradeable, OwnableUpgradeable {
     // EIP-2612: permit – 712-signed approvals
     // https://eips.ethereum.org/EIPS/eip-2612
     string public constant EIP712_REVISION = "1";
-    bytes32 public constant EIP712_DOMAIN = keccak256(
-        "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
-    );
-    bytes32 public constant PERMIT_TYPEHASH = keccak256(
-        "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"
-    );
+    bytes32 public constant EIP712_DOMAIN =
+        keccak256(
+            "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
+        );
+    bytes32 public constant PERMIT_TYPEHASH =
+        keccak256(
+            "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"
+        );
 
     // EIP-2612: keeps track of number of permits per address
     mapping(address => uint256) private _nonces;

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

@@ -1,15 +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 {
-    SignedSafeMathUpgradeable
-} from "@openzeppelin/contracts-upgradeable/math/SignedSafeMathUpgradeable.sol";
-import {
-    OwnableUpgradeable
-} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+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 {UInt256Lib} from "./UInt256Lib.sol";
 import {IXCAmple} from "../../_interfaces/IXCAmple.sol";

hardhat.config.js

@@ -97,6 +97,7 @@ module.exports = {
       url: 'https://polygon-mumbai.infura.io/v3/' + process.env.INFURA_SECRET
     },
 
+    // prod
     prodEthereumBaseChain: {
       url: 'https://mainnet.infura.io/v3/' + process.env.INFURA_SECRET
     },
@@ -106,6 +107,9 @@ module.exports = {
     prodAvaxSatChain: {
       url: 'https://api.avax.network/ext/bc/C/rpc'
     },
+    prodMeterSatChain: {
+      url: 'https://rpc.meter.io'
+    },
     prodMaticSatChain: {
       url: 'https://polygon-mainnet.infura.io/v3/' + process.env.INFURA_SECRET
     }

helpers/deploy.js

@@ -248,9 +248,8 @@ async function deployChainBridgeBaseChainGatewayContracts(
   const adminRole = await bridge.DEFAULT_ADMIN_ROLE();
   const isAdmin = await bridge.hasRole(adminRole, deployerAddress);
 
-  const reportRebaseFnSig = CB_FUNCTION_SIG_baseChainReportRebase(
-    rebaseGateway,
-  );
+  const reportRebaseFnSig =
+    CB_FUNCTION_SIG_baseChainReportRebase(rebaseGateway);
 
   if (isAdmin) {
     await (
@@ -356,9 +355,8 @@ async function deployChainBridgeSatelliteChainGatewayContracts(
   const adminRole = await bridge.DEFAULT_ADMIN_ROLE();
   const isAdmin = await bridge.hasRole(adminRole, await deployer.getAddress());
 
-  const reportRebaseFnSig = CB_FUNCTION_SIG_satelliteChainReportRebase(
-    rebaseGateway,
-  );
+  const reportRebaseFnSig =
+    CB_FUNCTION_SIG_satelliteChainReportRebase(rebaseGateway);
   if (isAdmin) {
     await (
       await bridge.adminSetGenericResource(