updated interfaces

Author: aalavandhan

contracts/_interfaces/IAMPL.sol

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.6.12;
+
+interface IAMPL {
+    // ERC20
+    function totalSupply() external view returns (uint256);
+
+    function balanceOf(address who) external view returns (uint256);
+
+    function allowance(address owner_, address spender) external view returns (uint256);
+
+    function transfer(address to, uint256 value) external returns (bool);
+
+    function approve(address spender, uint256 value) external returns (bool);
+
+    function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
+
+    function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
+
+    function transferFrom(
+        address from,
+        address to,
+        uint256 value
+    ) external returns (bool);
+
+    // EIP-2612
+    function permit(
+        address owner,
+        address spender,
+        uint256 value,
+        uint256 deadline,
+        uint8 v,
+        bytes32 r,
+        bytes32 s
+    ) external;
+
+    function nonces(address owner) external view returns (uint256);
+
+    function DOMAIN_SEPARATOR() external view returns (bytes32);
+
+    // Elastic token interface
+    function scaledBalanceOf(address who) external view returns (uint256);
+
+    function scaledTotalSupply() external view returns (uint256);
+
+    function transferAll(address to) external returns (bool);
+
+    function transferAllFrom(address from, address to) external returns (bool);
+}

contracts/_interfaces/IAmpleforth.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.6.12;
+
+interface IAmpleforth {
+    function epoch() external view returns (uint256);
+
+    function lastRebaseTimestampSec() external view returns (uint256);
+
+    function inRebaseWindow() external view returns (bool);
+
+    function globalAmpleforthEpochAndAMPLSupply() external view returns (uint256, uint256);
+}

contracts/_interfaces/IAmpleforthPolicy.sol

@@ -1,14 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.6.12;
 
-interface IXCAmple {
-    function globalAMPLSupply() external returns (uint256);
+import "./IAMPL.sol";
 
-    function mint(address who, uint256 value) external;
-
-    function burn(address who, uint256 value) external;
-
-    function rebase(uint256 globalAmpleforthEpoch_, uint256 globalAMPLSupply_)
-        external
-        returns (uint256);
+interface IXCAmple is IAMPL {
+    function globalAMPLSupply() external view returns (uint256);
 }

contracts/_interfaces/IXCAmple.sol

@@ -2,11 +2,11 @@
 pragma solidity 0.6.12;
 
 interface IXCAmpleController {
-    function globalAmpleforthEpoch() external returns (uint256);
+    function rebase() external;
 
-    function mint(address recipient, uint256 xcAmplAmount) external;
+    function lastRebaseTimestampSec() external view returns (uint256);
 
-    function burn(address depositor, uint256 xcAmplAmount) external;
+    function globalAmpleforthEpoch() external view returns (uint256);
 
-    function reportRebase(uint256 nextGlobalAmpleforthEpoch, uint256 nextGlobalAMPLSupply) external;
+    function globalAmpleforthEpochAndAMPLSupply() external view returns (uint256, uint256);
 }

contracts/_interfaces/IXCAmpleController.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.6.12;
+
+interface IXCAmpleControllerGateway {
+    function nextGlobalAmpleforthEpoch() external view returns (uint256);
+
+    function nextGlobalAMPLSupply() external view returns (uint256);
+
+    function mint(address recipient, uint256 xcAmplAmount) external;
+
+    function burn(address depositor, uint256 xcAmplAmount) external;
+
+    function reportRebase(uint256 nextGlobalAmpleforthEpoch_, uint256 nextGlobalAMPLSupply_)
+        external;
+}

contracts/_interfaces/IXCAmpleControllerGateway.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.6.12;
+
+interface IXCAmpleSupplyPolicy {
+    function rebase(uint256 globalAmpleforthEpoch_, uint256 globalAMPLSupply_)
+        external
+        returns (uint256);
+
+    function mint(address who, uint256 value) external;
+
+    function burn(address who, uint256 value) external;
+}

contracts/_interfaces/IXCAmpleSupplyPolicy.sol

@@ -87,8 +87,9 @@ async function setupAMPLContracts (deployer) {
   };
 
   const getCurrentState = async () => {
-    const epoch = await policy.epoch();
-    const totalSupply = await ampl.totalSupply();
+    const r = await policy.globalAmpleforthEpochAndAMPLSupply();
+    const epoch = r[0];
+    const totalSupply = r[1];
     return { epoch, totalSupply };
   };
 
@@ -141,8 +142,9 @@ async function setupXCAMPLContracts (deployer) {
   await xcController.setRebaseRelayer(xcRebaseRelayer.address);
 
   const getCurrentState = async () => {
-    const epoch = await xcController.globalAmpleforthEpoch();
-    const totalSupply = await xcAmple.globalAMPLSupply();
+    const r = await xcController.globalAmpleforthEpochAndAMPLSupply();
+    const epoch = r[0];
+    const totalSupply = r[1];
     return { epoch, totalSupply };
   };