Hamal release v2.62 to kovan

contracts/SupplySchedule.sol

@@ -19,18 +19,23 @@ contract SupplySchedule is Owned, ISupplySchedule {
     using SafeDecimalMath for uint;
     using Math for uint;
 
+    bytes32 public constant CONTRACT_NAME = "SupplySchedule";
+
     // Time of the last inflation supply mint event
     uint public lastMintEvent;
 
     // Counter for number of weeks since the start of supply inflation
     uint public weekCounter;
 
+    uint public constant INFLATION_START_DATE = 1551830400; // 2019-03-06T00:00:00+00:00
+
     // The number of SNX rewarded to the caller of Synthetix.mint()
-    uint public minterReward = 200 * SafeDecimalMath.unit();
+    uint public minterReward = 100 * 1e18;
 
-    // The initial weekly inflationary supply is 75m / 52 until the start of the decay rate.
-    // 75e6 * SafeDecimalMath.unit() / 52
-    uint public constant INITIAL_WEEKLY_SUPPLY = 1442307692307692307692307;
+    // The number of SNX minted per week
+    uint public inflationAmount;
+
+    uint public maxInflationAmount = 3e6 * 1e18; // max inflation amount 3,000,000
 
     // Address of the SynthetixProxy for the onlySynthetix modifier
     address payable public synthetixProxy;
@@ -41,16 +46,7 @@ contract SupplySchedule is Owned, ISupplySchedule {
     // How long each inflation period is before mint can be called
     uint public constant MINT_PERIOD_DURATION = 1 weeks;
 
-    uint public constant INFLATION_START_DATE = 1551830400; // 2019-03-06T00:00:00+00:00
     uint public constant MINT_BUFFER = 1 days;
-    uint8 public constant SUPPLY_DECAY_START = 40; // Week 40
-    uint8 public constant SUPPLY_DECAY_END = 234; //  Supply Decay ends on Week 234 (inclusive of Week 234 for a total of 195 weeks of inflation decay)
-
-    // Weekly percentage decay of inflationary supply from the first 40 weeks of the 75% inflation rate
-    uint public constant DECAY_RATE = 12500000000000000; // 1.25% weekly
-
-    // Percentage growth of terminal supply per annum
-    uint public constant TERMINAL_SUPPLY_RATE_ANNUAL = 25000000000000000; // 2.5% pa
 
     constructor(
         address _owner,
@@ -73,65 +69,12 @@ contract SupplySchedule is Owned, ISupplySchedule {
             return totalAmount;
         }
 
-        uint remainingWeeksToMint = weeksSinceLastIssuance();
-
-        uint currentWeek = weekCounter;
-
-        // Calculate total mintable supply from exponential decay function
-        // The decay function stops after week 234
-        while (remainingWeeksToMint > 0) {
-            currentWeek++;
-
-            if (currentWeek < SUPPLY_DECAY_START) {
-                // If current week is before supply decay we add initial supply to mintableSupply
-                totalAmount = totalAmount.add(INITIAL_WEEKLY_SUPPLY);
-                remainingWeeksToMint--;
-            } else if (currentWeek <= SUPPLY_DECAY_END) {
-                // if current week before supply decay ends we add the new supply for the week
-                // diff between current week and (supply decay start week - 1)
-                uint decayCount = currentWeek.sub(SUPPLY_DECAY_START - 1);
-
-                totalAmount = totalAmount.add(tokenDecaySupplyForWeek(decayCount));
-                remainingWeeksToMint--;
-            } else {
-                // Terminal supply is calculated on the total supply of Synthetix including any new supply
-                // We can compound the remaining week's supply at the fixed terminal rate
-                uint totalSupply = IERC20(synthetixProxy).totalSupply();
-                uint currentTotalSupply = totalSupply.add(totalAmount);
-
-                totalAmount = totalAmount.add(terminalInflationSupply(currentTotalSupply, remainingWeeksToMint));
-                remainingWeeksToMint = 0;
-            }
-        }
+        // Get total amount to mint * by number of weeks to mint
+        totalAmount = inflationAmount.mul(weeksSinceLastIssuance());
 
         return totalAmount;
     }
 
-    /**
-     * @return A unit amount of decaying inflationary supply from the INITIAL_WEEKLY_SUPPLY
-     * @dev New token supply reduces by the decay rate each week calculated as supply = INITIAL_WEEKLY_SUPPLY * ()
-     */
-    function tokenDecaySupplyForWeek(uint counter) public pure returns (uint) {
-        // Apply exponential decay function to number of weeks since
-        // start of inflation smoothing to calculate diminishing supply for the week.
-        uint effectiveDecay = (SafeDecimalMath.unit().sub(DECAY_RATE)).powDecimal(counter);
-        uint supplyForWeek = INITIAL_WEEKLY_SUPPLY.multiplyDecimal(effectiveDecay);
-
-        return supplyForWeek;
-    }
-
-    /**
-     * @return A unit amount of terminal inflation supply
-     * @dev Weekly compound rate based on number of weeks
-     */
-    function terminalInflationSupply(uint totalSupply, uint numOfWeeks) public pure returns (uint) {
-        // rate = (1 + weekly rate) ^ num of weeks
-        uint effectiveCompoundRate = SafeDecimalMath.unit().add(TERMINAL_SUPPLY_RATE_ANNUAL.div(52)).powDecimal(numOfWeeks);
-
-        // return Supply * (effectiveRate - 1) for extra supply to issue based on number of weeks
-        return totalSupply.multiplyDecimal(effectiveCompoundRate.sub(SafeDecimalMath.unit()));
-    }
-
     /**
      * @dev Take timeDiff in seconds (Dividend) and MINT_PERIOD_DURATION as (Divisor)
      * @return Calculate the numberOfWeeks since last mint rounded down to 1 week
@@ -161,8 +104,9 @@ contract SupplySchedule is Owned, ISupplySchedule {
      * week counter for the number of weeks minted (probabaly always 1)
      * and store the time of the event.
      * @param supplyMinted the amount of SNX the total supply was inflated by.
+     * @return minterReward the amount of SNX reward for caller
      * */
-    function recordMintEvent(uint supplyMinted) external onlySynthetix returns (bool) {
+    function recordMintEvent(uint supplyMinted) external onlySynthetix returns (uint) {
         uint numberOfWeeksIssued = weeksSinceLastIssuance();
 
         // add number of weeks minted to weekCounter
@@ -173,9 +117,11 @@ contract SupplySchedule is Owned, ISupplySchedule {
         lastMintEvent = INFLATION_START_DATE.add(weekCounter.mul(MINT_PERIOD_DURATION)).add(MINT_BUFFER);
 
         emit SupplyMinted(supplyMinted, numberOfWeeksIssued, lastMintEvent, now);
-        return true;
+        return minterReward;
     }
 
+    // ========== SETTERS ========== */
+
     /**
      * @notice Sets the reward amount of SNX for the caller of the public
      * function Synthetix.mint().
@@ -189,8 +135,6 @@ contract SupplySchedule is Owned, ISupplySchedule {
         emit MinterRewardUpdated(minterReward);
     }
 
-    // ========== SETTERS ========== */
-
     /**
      * @notice Set the SynthetixProxy should it ever change.
      * SupplySchedule requires Synthetix address as it has the authority
@@ -202,6 +146,22 @@ contract SupplySchedule is Owned, ISupplySchedule {
         emit SynthetixProxyUpdated(synthetixProxy);
     }
 
+    /**
+     * @notice Set the weekly inflationAmount.
+     * Protocol DAO sets the amount based on the target staking ratio
+     * Will be replaced with on-chain calculation of the staking ratio
+     * */
+    function setInflationAmount(uint amount) external onlyOwner {
+        require(amount <= maxInflationAmount, "Amount above maximum inflation");
+        inflationAmount = amount;
+        emit InflationAmountUpdated(inflationAmount);
+    }
+
+    function setMaxInflationAmount(uint amount) external onlyOwner {
+        maxInflationAmount = amount;
+        emit MaxInflationAmountUpdated(inflationAmount);
+    }
+
     // ========== MODIFIERS ==========
 
     /**
@@ -226,6 +186,16 @@ contract SupplySchedule is Owned, ISupplySchedule {
      * */
     event MinterRewardUpdated(uint newRewardAmount);
 
+    /**
+     * @notice Emitted when the Inflation amount is updated
+     * */
+    event InflationAmountUpdated(uint newInflationAmount);
+
+    /**
+     * @notice Emitted when the max Inflation amount is updated
+     * */
+    event MaxInflationAmountUpdated(uint newInflationAmount);
+
     /**
      * @notice Emitted when setSynthetixProxy is called changing the Synthetix Proxy address
      * */

contracts/Synthetix.sol

@@ -139,13 +139,13 @@ contract Synthetix is BaseSynthetix {
         uint supplyToMint = _supplySchedule.mintableSupply();
         require(supplyToMint > 0, "No supply is mintable");
 
+        emitTransfer(address(0), address(this), supplyToMint);
+
         // record minting event before mutation to token supply
-        _supplySchedule.recordMintEvent(supplyToMint);
+        uint minterReward = _supplySchedule.recordMintEvent(supplyToMint);
 
         // Set minted SNX balance to RewardEscrow's balance
         // Minus the minterReward and set balance of minter to add reward
-        uint minterReward = _supplySchedule.minterReward();
-        // Get the remainder
         uint amountToDistribute = supplyToMint.sub(minterReward);
 
         // Set the token balance to the RewardsDistribution contract
@@ -162,6 +162,7 @@ contract Synthetix is BaseSynthetix {
         tokenState.setBalanceOf(msg.sender, tokenState.balanceOf(msg.sender).add(minterReward));
         emitTransfer(address(this), msg.sender, minterReward);
 
+        // Increase total supply by minted amount
         totalSupply = totalSupply.add(supplyToMint);
 
         return true;

contracts/interfaces/ISupplySchedule.sol

@@ -10,5 +10,5 @@ interface ISupplySchedule {
     function minterReward() external view returns (uint);
 
     // Mutative functions
-    function recordMintEvent(uint supplyMinted) external returns (bool);
+    function recordMintEvent(uint supplyMinted) external returns (uint);
 }

contracts/migrations/Migration_Hamal.sol

@@ -0,0 +1,127 @@
+pragma solidity ^0.5.16;
+
+import "../BaseMigration.sol";
+import "../AddressResolver.sol";
+import "../ProxyERC20.sol";
+import "../TokenState.sol";
+import "../RewardEscrow.sol";
+import "../SupplySchedule.sol";
+import "../RewardsDistribution.sol";
+
+interface ISynthetixNamedContract {
+    // solhint-disable func-name-mixedcase
+    function CONTRACT_NAME() external view returns (bytes32);
+}
+
+// solhint-disable contract-name-camelcase
+contract Migration_Hamal is BaseMigration {
+    // https://kovan.etherscan.io/address/0x73570075092502472E4b61A7058Df1A4a1DB12f2;
+    address public constant OWNER = 0x73570075092502472E4b61A7058Df1A4a1DB12f2;
+
+    // ----------------------------
+    // EXISTING SYNTHETIX CONTRACTS
+    // ----------------------------
+
+    // https://kovan.etherscan.io/address/0x84f87E3636Aa9cC1080c07E6C61aDfDCc23c0db6
+    AddressResolver public constant addressresolver_i = AddressResolver(0x84f87E3636Aa9cC1080c07E6C61aDfDCc23c0db6);
+    // https://kovan.etherscan.io/address/0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F
+    ProxyERC20 public constant proxysynthetix_i = ProxyERC20(0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F);
+    // https://kovan.etherscan.io/address/0x46824bFAaFd049fB0Af9a45159A88e595Bbbb9f7
+    TokenState public constant tokenstatesynthetix_i = TokenState(0x46824bFAaFd049fB0Af9a45159A88e595Bbbb9f7);
+    // https://kovan.etherscan.io/address/0x8c6680412e914932A9abC02B6c7cbf690e583aFA
+    RewardEscrow public constant rewardescrow_i = RewardEscrow(0x8c6680412e914932A9abC02B6c7cbf690e583aFA);
+    // https://kovan.etherscan.io/address/0xd30F2EB31348DD03FC7a77130BbF66318a195c1E
+    SupplySchedule public constant supplyschedule_i = SupplySchedule(0xd30F2EB31348DD03FC7a77130BbF66318a195c1E);
+    // https://kovan.etherscan.io/address/0xD29160e4f5D2e5818041f9Cd9192853BA349c47E
+    RewardsDistribution public constant rewardsdistribution_i =
+        RewardsDistribution(0xD29160e4f5D2e5818041f9Cd9192853BA349c47E);
+
+    // ----------------------------------
+    // NEW CONTRACTS DEPLOYED TO BE ADDED
+    // ----------------------------------
+
+    // https://kovan.etherscan.io/address/0xAa1Cc6433be4EB877a4b5C087c95f5004e640F19
+    address public constant new_Synthetix_contract = 0xAa1Cc6433be4EB877a4b5C087c95f5004e640F19;
+    // https://kovan.etherscan.io/address/0xd30F2EB31348DD03FC7a77130BbF66318a195c1E
+    address public constant new_SupplySchedule_contract = 0xd30F2EB31348DD03FC7a77130BbF66318a195c1E;
+
+    constructor() public BaseMigration(OWNER) {}
+
+    function contractsRequiringOwnership() public pure returns (address[] memory contracts) {
+        contracts = new address[](6);
+        contracts[0] = address(addressresolver_i);
+        contracts[1] = address(proxysynthetix_i);
+        contracts[2] = address(tokenstatesynthetix_i);
+        contracts[3] = address(rewardescrow_i);
+        contracts[4] = address(supplyschedule_i);
+        contracts[5] = address(rewardsdistribution_i);
+    }
+
+    function migrate() external onlyOwner {
+        require(
+            ISynthetixNamedContract(new_Synthetix_contract).CONTRACT_NAME() == "Synthetix",
+            "Invalid contract supplied for Synthetix"
+        );
+
+        // ACCEPT OWNERSHIP for all contracts that require ownership to make changes
+        acceptAll();
+
+        // MIGRATION
+        // Import all new contracts into the address resolver;
+        addressresolver_importAddresses_0();
+        // Rebuild the resolver caches in all MixinResolver contracts - batch 1;
+        addressresolver_rebuildCaches_1();
+        // Ensure the SNX proxy has the correct Synthetix target set;
+        proxysynthetix_i.setTarget(Proxyable(new_Synthetix_contract));
+        // Ensure the Synthetix contract can write to its TokenState contract;
+        tokenstatesynthetix_i.setAssociatedContract(new_Synthetix_contract);
+        // Ensure the legacy RewardEscrow contract is connected to the Synthetix contract;
+        rewardescrow_i.setSynthetix(ISynthetix(new_Synthetix_contract));
+        // Ensure the SupplySchedule is connected to the SNX proxy for reading;
+        supplyschedule_i.setSynthetixProxy(ISynthetix(0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F));
+        // Ensure the RewardsDistribution has Synthetix set as its authority for distribution;
+        rewardsdistribution_i.setAuthority(new_Synthetix_contract);
+
+        // NOMINATE OWNERSHIP back to owner for aforementioned contracts
+        nominateAll();
+    }
+
+    function acceptAll() internal {
+        address[] memory contracts = contractsRequiringOwnership();
+        for (uint i = 0; i < contracts.length; i++) {
+            Owned(contracts[i]).acceptOwnership();
+        }
+    }
+
+    function nominateAll() internal {
+        address[] memory contracts = contractsRequiringOwnership();
+        for (uint i = 0; i < contracts.length; i++) {
+            returnOwnership(contracts[i]);
+        }
+    }
+
+    function addressresolver_importAddresses_0() internal {
+        bytes32[] memory addressresolver_importAddresses_names_0_0 = new bytes32[](2);
+        addressresolver_importAddresses_names_0_0[0] = bytes32("Synthetix");
+        addressresolver_importAddresses_names_0_0[1] = bytes32("SupplySchedule");
+        address[] memory addressresolver_importAddresses_destinations_0_1 = new address[](2);
+        addressresolver_importAddresses_destinations_0_1[0] = address(new_Synthetix_contract);
+        addressresolver_importAddresses_destinations_0_1[1] = address(new_SupplySchedule_contract);
+        addressresolver_i.importAddresses(
+            addressresolver_importAddresses_names_0_0,
+            addressresolver_importAddresses_destinations_0_1
+        );
+    }
+
+    function addressresolver_rebuildCaches_1() internal {
+        MixinResolver[] memory addressresolver_rebuildCaches_destinations_1_0 = new MixinResolver[](7);
+        addressresolver_rebuildCaches_destinations_1_0[0] = MixinResolver(0x64ac15AB583fFfA6a7401B83E3aA5cf4Ad1aA92A);
+        addressresolver_rebuildCaches_destinations_1_0[1] = MixinResolver(0x9880cfA7B81E8841e216ebB32687A2c9551ae333);
+        addressresolver_rebuildCaches_destinations_1_0[2] = MixinResolver(0x3cc158e3D4412311166D74e8BeE1411Cda58c8A3);
+        addressresolver_rebuildCaches_destinations_1_0[3] = MixinResolver(0xD0B60E2FAb47e703ffa0da7364Efb9536C430912);
+        addressresolver_rebuildCaches_destinations_1_0[4] = MixinResolver(0xBBfAd9112203b943f26320B330B75BABF6e2aF2a);
+        addressresolver_rebuildCaches_destinations_1_0[5] = MixinResolver(0xD134Db47DDF5A6feB245452af17cCAf92ee53D3c);
+        addressresolver_rebuildCaches_destinations_1_0[6] = MixinResolver(new_Synthetix_contract);
+        addressresolver_i.rebuildCaches(addressresolver_rebuildCaches_destinations_1_0);
+    }
+}

index.js

@@ -89,7 +89,7 @@ const constants = {
 	ZERO_ADDRESS: '0x' + '0'.repeat(40),
 	ZERO_BYTES32: '0x' + '0'.repeat(64),
 
-	inflationStartTimestampInSecs: 1551830400, // 2019-03-06T00:00:00Z
+	inflationStartTimestampInSecs: 1551830400, // 2019-03-06T00:00:00+00:00
 };
 
 const knownAccounts = {