diff --git a/contracts/common/UsingRegistry.sol b/contracts/common/UsingRegistry.sol
new file mode 100644
index 0000000..1ff264b
--- /dev/null
+++ b/contracts/common/UsingRegistry.sol
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.5.13;
+
+import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
+
+import "celo/contracts/common/interfaces/IFreezer.sol";
+import "celo/contracts/common/interfaces/IRegistry.sol";
+
+import "../interfaces/IExchange.sol";
+import "../interfaces/IStableTokenV2.sol";
+import "../interfaces/IReserve.sol";
+import "../interfaces/ISortedOracles.sol";
+
+contract UsingRegistry is Ownable {
+  event RegistrySet(address indexed registryAddress);
+
+  // solhint-disable state-visibility
+  bytes32 constant ACCOUNTS_REGISTRY_ID = keccak256(abi.encodePacked("Accounts"));
+  bytes32 constant ATTESTATIONS_REGISTRY_ID = keccak256(abi.encodePacked("Attestations"));
+  bytes32 constant DOWNTIME_SLASHER_REGISTRY_ID = keccak256(abi.encodePacked("DowntimeSlasher"));
+  bytes32 constant DOUBLE_SIGNING_SLASHER_REGISTRY_ID = keccak256(abi.encodePacked("DoubleSigningSlasher"));
+  bytes32 constant ELECTION_REGISTRY_ID = keccak256(abi.encodePacked("Election"));
+  bytes32 constant EXCHANGE_REGISTRY_ID = keccak256(abi.encodePacked("Exchange"));
+  bytes32 constant FEE_CURRENCY_WHITELIST_REGISTRY_ID = keccak256(abi.encodePacked("FeeCurrencyWhitelist"));
+  bytes32 constant FREEZER_REGISTRY_ID = keccak256(abi.encodePacked("Freezer"));
+  bytes32 constant GOLD_TOKEN_REGISTRY_ID = keccak256(abi.encodePacked("GoldToken"));
+  bytes32 constant GOVERNANCE_REGISTRY_ID = keccak256(abi.encodePacked("Governance"));
+  bytes32 constant GOVERNANCE_SLASHER_REGISTRY_ID = keccak256(abi.encodePacked("GovernanceSlasher"));
+  bytes32 constant LOCKED_GOLD_REGISTRY_ID = keccak256(abi.encodePacked("LockedGold"));
+  bytes32 constant RESERVE_REGISTRY_ID = keccak256(abi.encodePacked("Reserve"));
+  bytes32 constant RANDOM_REGISTRY_ID = keccak256(abi.encodePacked("Random"));
+  bytes32 constant SORTED_ORACLES_REGISTRY_ID = keccak256(abi.encodePacked("SortedOracles"));
+  bytes32 constant STABLE_TOKEN_REGISTRY_ID = keccak256(abi.encodePacked("StableToken"));
+  bytes32 constant VALIDATORS_REGISTRY_ID = keccak256(abi.encodePacked("Validators"));
+  // solhint-enable state-visibility
+
+  IRegistry public registry;
+
+  modifier onlyRegisteredContract(bytes32 identifierHash) {
+    require(registry.getAddressForOrDie(identifierHash) == msg.sender, "only registered contract");
+    _;
+  }
+
+  modifier onlyRegisteredContracts(bytes32[] memory identifierHashes) {
+    require(registry.isOneOf(identifierHashes, msg.sender), "only registered contracts");
+    _;
+  }
+
+  /**
+   * @notice Updates the address pointing to a Registry contract.
+   * @param registryAddress The address of a registry contract for routing to other contracts.
+   */
+  function setRegistry(address registryAddress) public onlyOwner {
+    require(registryAddress != address(0), "Cannot register the null address");
+    registry = IRegistry(registryAddress);
+    emit RegistrySet(registryAddress);
+  }
+
+  function getExchange() internal view returns (IExchange) {
+    return IExchange(registry.getAddressForOrDie(EXCHANGE_REGISTRY_ID));
+  }
+
+  function getFreezer() internal view returns (IFreezer) {
+    return IFreezer(registry.getAddressForOrDie(FREEZER_REGISTRY_ID));
+  }
+
+  function getGoldToken() internal view returns (IERC20) {
+    return IERC20(registry.getAddressForOrDie(GOLD_TOKEN_REGISTRY_ID));
+  }
+
+  function getReserve() internal view returns (IReserve) {
+    return IReserve(registry.getAddressForOrDie(RESERVE_REGISTRY_ID));
+  }
+
+  function getSortedOracles() internal view returns (ISortedOracles) {
+    return ISortedOracles(registry.getAddressForOrDie(SORTED_ORACLES_REGISTRY_ID));
+  }
+
+  function getStableToken() internal view returns (IStableTokenV2) {
+    return IStableTokenV2(registry.getAddressForOrDie(STABLE_TOKEN_REGISTRY_ID));
+  }
+}
diff --git a/contracts/interfaces/IBreakerBox.sol b/contracts/interfaces/IBreakerBox.sol
new file mode 100644
index 0000000..f74b7d0
--- /dev/null
+++ b/contracts/interfaces/IBreakerBox.sol
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity >0.5.13 <0.9;
+pragma experimental ABIEncoderV2;
+
+import { ISortedOracles } from "./ISortedOracles.sol";
+
+/**
+ * @title Breaker Box Interface
+ * @notice Defines the basic interface for the Breaker Box
+ */
+interface IBreakerBox {
+  /**
+   * @dev Used to keep track of the status of a breaker for a specific rate feed.
+   *
+   * - TradingMode: Represents the trading mode the breaker is in for a rate feed.
+   *                This uses a bitmask approach, meaning each bit represents a
+   *                different trading mode. The final trading mode of the rate feed
+   *                is obtained by applying a logical OR operation to the TradingMode
+   *                of all breakers associated with that rate feed. This allows multiple
+   *                breakers to contribute to the final trading mode simultaneously.
+   *                Possible values:
+   *                0: bidirectional trading.
+   *                1: inflow only.
+   *                2: outflow only.
+   *                3: trading halted.
+   *
+   * - LastUpdatedTime: Records the last time the breaker status was updated. This is
+   *                    used to manage cooldown periods before the breaker can be reset.
+   *
+   * - Enabled:     Indicates whether the breaker is enabled for the associated rate feed.
+   */
+  struct BreakerStatus {
+    uint8 tradingMode;
+    uint64 lastUpdatedTime;
+    bool enabled;
+  }
+
+  /**
+   * @notice Emitted when a new breaker is added to the breaker box.
+   * @param breaker The address of the breaker.
+   */
+  event BreakerAdded(address indexed breaker);
+
+  /**
+   * @notice Emitted when a breaker is removed from the breaker box.
+   * @param breaker The address of the breaker.
+   */
+  event BreakerRemoved(address indexed breaker);
+
+  /**
+   * @notice Emitted when a breaker is tripped by a rate feed.
+   * @param breaker The address of the breaker.
+   * @param rateFeedID The address of the rate feed.
+   */
+  event BreakerTripped(address indexed breaker, address indexed rateFeedID);
+
+  /**
+   * @notice Emitted when a new rate feed is added to the breaker box.
+   * @param rateFeedID The address of the rate feed.
+   */
+  event RateFeedAdded(address indexed rateFeedID);
+
+  /**
+   * @notice Emitted when dependencies for a rate feed are set.
+   * @param rateFeedID The address of the rate feed.
+   * @param dependencies The addresses of the dependendent rate feeds.
+   */
+  event RateFeedDependenciesSet(address indexed rateFeedID, address[] indexed dependencies);
+
+  /**
+   * @notice Emitted when a rate feed is removed from the breaker box.
+   * @param rateFeedID The address of the rate feed.
+   */
+  event RateFeedRemoved(address indexed rateFeedID);
+
+  /**
+   * @notice Emitted when the trading mode for a rate feed is updated
+   * @param rateFeedID The address of the rate feed.
+   * @param tradingMode The new trading mode.
+   */
+  event TradingModeUpdated(address indexed rateFeedID, uint256 tradingMode);
+
+  /**
+   * @notice Emitted after a reset attempt is successful.
+   * @param rateFeedID The address of the rate feed.
+   * @param breaker The address of the breaker.
+   */
+  event ResetSuccessful(address indexed rateFeedID, address indexed breaker);
+
+  /**
+   * @notice  Emitted after a reset attempt fails when the
+   *          rate feed fails the breakers reset criteria.
+   * @param rateFeedID The address of the rate feed.
+   * @param breaker The address of the breaker.
+   */
+  event ResetAttemptCriteriaFail(address indexed rateFeedID, address indexed breaker);
+
+  /**
+   * @notice Emitted after a reset attempt fails when cooldown time has not elapsed.
+   * @param rateFeedID The address of the rate feed.
+   * @param breaker The address of the breaker.
+   */
+  event ResetAttemptNotCool(address indexed rateFeedID, address indexed breaker);
+
+  /**
+   * @notice Emitted when the sortedOracles address is updated.
+   * @param newSortedOracles The address of the new sortedOracles.
+   */
+  event SortedOraclesUpdated(address indexed newSortedOracles);
+
+  /**
+   * @notice Emitted when the breaker is enabled or disabled for a rate feed.
+   * @param breaker The address of the breaker.
+   * @param rateFeedID The address of the rate feed.
+   * @param status Indicating the status.
+   */
+  event BreakerStatusUpdated(address breaker, address rateFeedID, bool status);
+
+  /**
+   * @notice Retrives an array of all breaker addresses.
+   */
+  function getBreakers() external view returns (address[] memory);
+
+  /**
+   * @notice Checks if a breaker with the specified address has been added to the breaker box.
+   * @param breaker The address of the breaker to check;
+   * @return A bool indicating whether or not the breaker has been added.
+   */
+  function isBreaker(address breaker) external view returns (bool);
+
+  /**
+   * @notice Checks breakers for the rateFeedID and sets correct trading mode
+   * if any breakers are tripped or need to be reset.
+   * @param rateFeedID The address of the rate feed to run checks for.
+   */
+  function checkAndSetBreakers(address rateFeedID) external;
+
+  /**
+   * @notice Gets the trading mode for the specified rateFeedID.
+   * @param rateFeedID The address of the rate feed to retrieve the trading mode for.
+   */
+  function getRateFeedTradingMode(address rateFeedID) external view returns (uint8 tradingMode);
+
+  /**
+   * @notice Adds a breaker to the end of the list of breakers & the breakerTradingMode mapping.
+   * @param breaker The address of the breaker to be added.
+   * @param tradingMode The trading mode of the breaker to be added.
+   */
+  function addBreaker(address breaker, uint8 tradingMode) external;
+
+  /**
+   * @notice Removes the specified breaker from the list of breakers
+   *         and resets breakerTradingMode mapping + BreakerStatus.
+   * @param breaker The address of the breaker to be removed.
+   */
+  function removeBreaker(address breaker) external;
+
+  /**
+   * @notice Enables or disables a breaker for the specified rate feed.
+   * @param breakerAddress The address of the breaker.
+   * @param rateFeedID The address of the rateFeed to be toggled.
+   * @param enable Boolean indicating whether the breaker should be
+   *               enabled or disabled for the given rateFeed.
+   */
+  function toggleBreaker(address breakerAddress, address rateFeedID, bool enable) external;
+
+  /**
+   * @notice Adds a rateFeedID to the mapping of monitored rateFeedIDs.
+   * @param rateFeedID The address of the rateFeed to be added.
+   */
+  function addRateFeed(address rateFeedID) external;
+
+  /**
+   * @notice Adds the specified rateFeedIDs to the mapping of monitored rateFeedIDs.
+   * @param newRateFeedIDs The array of rateFeed addresses to be added.
+   */
+  function addRateFeeds(address[] calldata newRateFeedIDs) external;
+
+  /**
+   * @notice Sets dependent rate feeds for a given rate feed.
+   * @param rateFeedID The address of the rate feed.
+   * @param dependencies The array of dependent rate feeds.
+   */
+  function setRateFeedDependencies(address rateFeedID, address[] calldata dependencies) external;
+
+  /**
+   * @notice Removes a rateFeed from the mapping of monitored rateFeeds
+   *         and resets all the BreakerStatus entries for that rateFeed.
+   * @param rateFeedID The address of the rateFeed to be removed.
+   */
+  function removeRateFeed(address rateFeedID) external;
+
+  /**
+   * @notice Sets the trading mode for the specified rateFeed.
+   * @param rateFeedID The address of the rateFeed.
+   * @param tradingMode The trading mode that should be set.
+   */
+  function setRateFeedTradingMode(address rateFeedID, uint8 tradingMode) external;
+
+  /**
+   * @notice Returns addresses of rateFeedIDs that have been added.
+   */
+  function getRateFeeds() external view returns (address[] memory);
+
+  /**
+   * @notice Checks if a breaker is enabled for a specific rate feed.
+   * @param breaker The address of the breaker we're checking for.
+   * @param rateFeedID The address of the rateFeed.
+   */
+  function isBreakerEnabled(address breaker, address rateFeedID) external view returns (bool);
+
+  /**
+   * @notice Sets the address of the sortedOracles contract.
+   * @param _sortedOracles The new address of the sorted oracles contract.
+   */
+  function setSortedOracles(ISortedOracles _sortedOracles) external;
+
+  /// @notice Public state variable getters:
+  function breakerTradingMode(address) external view returns (uint8);
+
+  function sortedOracles() external view returns (address);
+
+  function rateFeedStatus(address) external view returns (bool);
+
+  function owner() external view returns (address);
+
+  function rateFeedBreakerStatus(address, address) external view returns (BreakerStatus memory);
+
+  function rateFeedDependencies(address, uint256) external view returns (address);
+
+  function rateFeedTradingMode(address) external view returns (uint8);
+}
diff --git a/contracts/interfaces/IExchange.sol b/contracts/interfaces/IExchange.sol
new file mode 100644
index 0000000..6e18611
--- /dev/null
+++ b/contracts/interfaces/IExchange.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.5.13;
+
+interface IExchange {
+  function buy(uint256, uint256, bool) external returns (uint256);
+
+  function sell(uint256, uint256, bool) external returns (uint256);
+
+  function exchange(uint256, uint256, bool) external returns (uint256);
+
+  function setUpdateFrequency(uint256) external;
+
+  function getBuyTokenAmount(uint256, bool) external view returns (uint256);
+
+  function getSellTokenAmount(uint256, bool) external view returns (uint256);
+
+  function getBuyAndSellBuckets(bool) external view returns (uint256, uint256);
+}
diff --git a/contracts/interfaces/ISortedOracles.sol b/contracts/interfaces/ISortedOracles.sol
new file mode 100644
index 0000000..2a57852
--- /dev/null
+++ b/contracts/interfaces/ISortedOracles.sol
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity >0.5.13 <0.9;
+
+import { IBreakerBox } from "./IBreakerBox.sol";
+
+interface ISortedOracles {
+  enum MedianRelation {
+    Undefined,
+    Lesser,
+    Greater,
+    Equal
+  }
+
+  function addOracle(address, address) external;
+
+  function removeOracle(address, address, uint256) external;
+
+  function report(address, uint256, address, address) external;
+
+  function removeExpiredReports(address, uint256) external;
+
+  function isOldestReportExpired(address token) external view returns (bool, address);
+
+  function numRates(address) external view returns (uint256);
+
+  function medianRate(address) external view returns (uint256, uint256);
+
+  function numTimestamps(address) external view returns (uint256);
+
+  function medianTimestamp(address) external view returns (uint256);
+
+  function getOracles(address) external view returns (address[] memory);
+
+  function getRates(address token) external view returns (address[] memory, uint256[] memory, MedianRelation[] memory);
+
+  function getTimestamps(
+    address token
+  ) external view returns (address[] memory, uint256[] memory, MedianRelation[] memory);
+
+  function initialize(uint256) external;
+
+  function setBreakerBox(IBreakerBox) external;
+
+  function getTokenReportExpirySeconds(address token) external view returns (uint256);
+
+  function oracles(address, uint256) external view returns (address);
+
+  function breakerBox() external view returns (IBreakerBox);
+}
diff --git a/contracts/swap/Reserve.sol b/contracts/swap/Reserve.sol
index 918e938..397801a 100644
--- a/contracts/swap/Reserve.sol
+++ b/contracts/swap/Reserve.sol
@@ -19,734 +19,937 @@ import "contracts/interfaces/ISortedOracles.sol";
  * @title Ensures price stability of StableTokens with respect to their pegs
  */
 // solhint-disable-next-line max-states-count
-contract Reserve is IReserve, ICeloVersionedContract, Ownable, Initializable, UsingRegistry, ReentrancyGuard {
-  using SafeMath for uint256;
-  using FixidityLib for FixidityLib.Fraction;
-  using Address for address payable; // prettier-ignore
-  using SafeERC20 for IERC20;
-
-  struct TobinTaxCache {
-    uint128 numerator;
-    uint128 timestamp;
-  }
-
-  mapping(address => bool) public isToken;
-  address[] private _tokens;
-  TobinTaxCache public tobinTaxCache;
-  uint256 public tobinTaxStalenessThreshold;
-  uint256 public tobinTax;
-  uint256 public tobinTaxReserveRatio;
-  mapping(address => bool) public isSpender;
-
-  mapping(address => bool) public isOtherReserveAddress;
-  address[] public otherReserveAddresses;
-
-  bytes32[] public assetAllocationSymbols;
-  mapping(bytes32 => uint256) public assetAllocationWeights;
-
-  uint256 public lastSpendingDay;
-  uint256 public spendingLimit;
-  FixidityLib.Fraction private spendingRatio;
-
-  uint256 public frozenReserveGoldStartBalance;
-  uint256 public frozenReserveGoldStartDay;
-  uint256 public frozenReserveGoldDays;
-
-  mapping(address => bool) public isExchangeSpender;
-  address[] public exchangeSpenderAddresses;
-  mapping(address => FixidityLib.Fraction) private collateralAssetDailySpendingRatio;
-  mapping(address => uint256) public collateralAssetLastSpendingDay;
-  address[] public collateralAssets;
-  mapping(address => bool) public isCollateralAsset;
-  mapping(address => uint256) public collateralAssetSpendingLimit;
-
-  event TobinTaxStalenessThresholdSet(uint256 value);
-  event DailySpendingRatioSet(uint256 ratio);
-  event TokenAdded(address indexed token);
-  event TokenRemoved(address indexed token, uint256 index);
-  event SpenderAdded(address indexed spender);
-  event SpenderRemoved(address indexed spender);
-  event OtherReserveAddressAdded(address indexed otherReserveAddress);
-  event OtherReserveAddressRemoved(address indexed otherReserveAddress, uint256 index);
-  event AssetAllocationSet(bytes32[] symbols, uint256[] weights);
-  event ReserveGoldTransferred(address indexed spender, address indexed to, uint256 value);
-  event TobinTaxSet(uint256 value);
-  event TobinTaxReserveRatioSet(uint256 value);
-  event ExchangeSpenderAdded(address indexed exchangeSpender);
-  event ExchangeSpenderRemoved(address indexed exchangeSpender);
-  event DailySpendingRatioForCollateralAssetSet(address collateralAsset, uint256 collateralAssetDailySpendingRatios);
-  event ReserveCollateralAssetsTransferred(address indexed spender, address indexed to, uint256 value, address token);
-  event CollateralAssetRemoved(address collateralAsset);
-  event CollateralAssetAdded(address collateralAsset);
-
-  /**
-   * @notice Sets initialized == true on implementation contracts
-   * @param test Set to true to skip implementation initialization
-   */
-  constructor(bool test) public Initializable(test) {}
-
-  modifier isStableToken(address token) {
-    require(isToken[token], "token addr was never registered");
-    _;
-  }
-
-  /**
-   * @notice Returns the storage, major, minor, and patch version of the contract.
-   * @return Storage version of the contract.
-   * @return Major version of the contract.
-   * @return Minor version of the contract.
-   * @return Patch version of the contract.
-   */
-  function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (2, 1, 0, 0);
-  }
-
-  function() external payable {} // solhint-disable no-empty-blocks
-
-  /**
-   * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.
-   * @param registryAddress The address of the registry core smart contract.
-   * @param _tobinTaxStalenessThreshold The initial number of seconds to cache tobin tax value for.
-   * @param _spendingRatioForCelo The relative daily spending limit for the reserve spender.
-   * @param _frozenGold The balance of reserve gold that is frozen.
-   * @param _frozenDays The number of days during which the frozen gold thaws.
-   * @param _assetAllocationSymbols The symbols of the reserve assets.
-   * @param _assetAllocationWeights The reserve asset weights.
-   * @param _tobinTax The tobin tax value as a fixidity fraction.
-   * @param _tobinTaxReserveRatio When to turn on the tobin tax, as a fixidity fraction.
-   * @param _collateralAssets The relative daily spending limit
-   * of an ERC20 collateral asset for the reserve spender.
-   * @param _collateralAssetDailySpendingRatios The address of an ERC20 collateral asset
-   */
-  function initialize(
-    address registryAddress,
-    uint256 _tobinTaxStalenessThreshold,
-    uint256 _spendingRatioForCelo,
-    uint256 _frozenGold,
-    uint256 _frozenDays,
-    bytes32[] calldata _assetAllocationSymbols,
-    uint256[] calldata _assetAllocationWeights,
-    uint256 _tobinTax,
-    uint256 _tobinTaxReserveRatio,
-    address[] calldata _collateralAssets,
-    uint256[] calldata _collateralAssetDailySpendingRatios
-  ) external initializer {
-    _transferOwnership(msg.sender);
-    setRegistry(registryAddress);
-    setTobinTaxStalenessThreshold(_tobinTaxStalenessThreshold);
-    setDailySpendingRatio(_spendingRatioForCelo);
-    setFrozenGold(_frozenGold, _frozenDays);
-    setAssetAllocations(_assetAllocationSymbols, _assetAllocationWeights);
-    setTobinTax(_tobinTax);
-    setTobinTaxReserveRatio(_tobinTaxReserveRatio);
-    for (uint256 i = 0; i < _collateralAssets.length; i++) {
-      addCollateralAsset(_collateralAssets[i]);
-    }
-    setDailySpendingRatioForCollateralAssets(_collateralAssets, _collateralAssetDailySpendingRatios);
-  }
-
-  /**
-   * @notice Sets the number of seconds to cache the tobin tax value for.
-   * @param value The number of seconds to cache the tobin tax value for.
-   */
-  function setTobinTaxStalenessThreshold(uint256 value) public onlyOwner {
-    require(value > 0, "value was zero");
-    tobinTaxStalenessThreshold = value;
-    emit TobinTaxStalenessThresholdSet(value);
-  }
-
-  /**
-   * @notice Sets the tobin tax.
-   * @param value The tobin tax.
-   */
-  function setTobinTax(uint256 value) public onlyOwner {
-    require(FixidityLib.wrap(value).lte(FixidityLib.fixed1()), "tobin tax cannot be larger than 1");
-    tobinTax = value;
-    emit TobinTaxSet(value);
-  }
-
-  /**
-   * @notice Sets the reserve ratio at which the tobin tax sets in.
-   * @param value The reserve ratio at which the tobin tax sets in.
-   */
-  function setTobinTaxReserveRatio(uint256 value) public onlyOwner {
-    tobinTaxReserveRatio = value;
-    emit TobinTaxReserveRatioSet(value);
-  }
-
-  /**
-   * @notice Set the ratio of reserve that is spendable per day.
-   * @param ratio Spending ratio as unwrapped Fraction.
-   */
-  function setDailySpendingRatio(uint256 ratio) public onlyOwner {
-    spendingRatio = FixidityLib.wrap(ratio);
-    require(spendingRatio.lte(FixidityLib.fixed1()), "spending ratio cannot be larger than 1");
-    emit DailySpendingRatioSet(ratio);
-  }
-
-  /**
-   * @notice Set the ratio of reserve for a given collateral asset
-   * that is spendable per day.
-   * @param _collateralAssets Collection of the addresses of collateral assets
-   * we're setting a limit for.
-   * @param collateralAssetDailySpendingRatios Collection of the relative daily spending limits
-   * of collateral assets.
-   */
-  function setDailySpendingRatioForCollateralAssets(
-    address[] memory _collateralAssets,
-    uint256[] memory collateralAssetDailySpendingRatios
-  ) public onlyOwner {
-    require(
-      _collateralAssets.length == collateralAssetDailySpendingRatios.length,
-      "token addresses and spending ratio lengths have to be the same"
+contract Reserve is
+    IReserve,
+    ICeloVersionedContract,
+    Ownable,
+    Initializable,
+    UsingRegistry,
+    ReentrancyGuard
+{
+    using SafeMath for uint256;
+    using FixidityLib for FixidityLib.Fraction;
+    using Address for address payable; // prettier-ignore
+    using SafeERC20 for IERC20;
+
+    struct TobinTaxCache {
+        uint128 numerator;
+        uint128 timestamp;
+    }
+
+    mapping(address => bool) public isToken;
+    address[] private _tokens;
+    TobinTaxCache public tobinTaxCache;
+    uint256 public tobinTaxStalenessThreshold;
+    uint256 public tobinTax;
+    uint256 public tobinTaxReserveRatio;
+    mapping(address => bool) public isSpender;
+
+    mapping(address => bool) public isOtherReserveAddress;
+    address[] public otherReserveAddresses;
+
+    bytes32[] public assetAllocationSymbols;
+    mapping(bytes32 => uint256) public assetAllocationWeights;
+
+    uint256 public lastSpendingDay;
+    uint256 public spendingLimit;
+    FixidityLib.Fraction private spendingRatio;
+
+    uint256 public frozenReserveGoldStartBalance;
+    uint256 public frozenReserveGoldStartDay;
+    uint256 public frozenReserveGoldDays;
+
+    mapping(address => bool) public isExchangeSpender;
+    address[] public exchangeSpenderAddresses;
+    mapping(address => FixidityLib.Fraction)
+        private collateralAssetDailySpendingRatio;
+    mapping(address => uint256) public collateralAssetLastSpendingDay;
+    address[] public collateralAssets;
+    mapping(address => bool) public isCollateralAsset;
+    mapping(address => uint256) public collateralAssetSpendingLimit;
+
+    event TobinTaxStalenessThresholdSet(uint256 value);
+    event DailySpendingRatioSet(uint256 ratio);
+    event TokenAdded(address indexed token);
+    event TokenRemoved(address indexed token, uint256 index);
+    event SpenderAdded(address indexed spender);
+    event SpenderRemoved(address indexed spender);
+    event OtherReserveAddressAdded(address indexed otherReserveAddress);
+    event OtherReserveAddressRemoved(
+        address indexed otherReserveAddress,
+        uint256 index
+    );
+    event AssetAllocationSet(bytes32[] symbols, uint256[] weights);
+    event ReserveGoldTransferred(
+        address indexed spender,
+        address indexed to,
+        uint256 value
+    );
+    event TobinTaxSet(uint256 value);
+    event TobinTaxReserveRatioSet(uint256 value);
+    event ExchangeSpenderAdded(address indexed exchangeSpender);
+    event ExchangeSpenderRemoved(address indexed exchangeSpender);
+    event DailySpendingRatioForCollateralAssetSet(
+        address collateralAsset,
+        uint256 collateralAssetDailySpendingRatios
+    );
+    event ReserveCollateralAssetsTransferred(
+        address indexed spender,
+        address indexed to,
+        uint256 value,
+        address token
     );
-    for (uint256 i = 0; i < _collateralAssets.length; i++) {
-      if (_collateralAssets[i] != address(0) && collateralAssetDailySpendingRatios[i] != 0) {
+    event CollateralAssetRemoved(address collateralAsset);
+    event CollateralAssetAdded(address collateralAsset);
+
+    /**
+     * @notice Sets initialized == true on implementation contracts
+     * @param test Set to true to skip implementation initialization
+     */
+    constructor(bool test) public Initializable(test) {}
+
+    modifier isStableToken(address token) {
+        require(isToken[token], "token addr was never registered");
+        _;
+    }
+
+    /**
+     * @notice Returns the storage, major, minor, and patch version of the contract.
+     * @return Storage version of the contract.
+     * @return Major version of the contract.
+     * @return Minor version of the contract.
+     * @return Patch version of the contract.
+     */
+    function getVersionNumber()
+        external
+        pure
+        returns (uint256, uint256, uint256, uint256)
+    {
+        return (2, 1, 0, 0);
+    }
+
+    function() external payable {} // solhint-disable no-empty-blocks
+
+    /**
+     * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.
+     * @param registryAddress The address of the registry core smart contract.
+     * @param _tobinTaxStalenessThreshold The initial number of seconds to cache tobin tax value for.
+     * @param _spendingRatioForCelo The relative daily spending limit for the reserve spender.
+     * @param _frozenGold The balance of reserve gold that is frozen.
+     * @param _frozenDays The number of days during which the frozen gold thaws.
+     * @param _assetAllocationSymbols The symbols of the reserve assets.
+     * @param _assetAllocationWeights The reserve asset weights.
+     * @param _tobinTax The tobin tax value as a fixidity fraction.
+     * @param _tobinTaxReserveRatio When to turn on the tobin tax, as a fixidity fraction.
+     * @param _collateralAssets The relative daily spending limit
+     * of an ERC20 collateral asset for the reserve spender.
+     * @param _collateralAssetDailySpendingRatios The address of an ERC20 collateral asset
+     */
+    function initialize(
+        address registryAddress,
+        uint256 _tobinTaxStalenessThreshold,
+        uint256 _spendingRatioForCelo,
+        uint256 _frozenGold,
+        uint256 _frozenDays,
+        bytes32[] calldata _assetAllocationSymbols,
+        uint256[] calldata _assetAllocationWeights,
+        uint256 _tobinTax,
+        uint256 _tobinTaxReserveRatio,
+        address[] calldata _collateralAssets,
+        uint256[] calldata _collateralAssetDailySpendingRatios
+    ) external initializer {
+        _transferOwnership(msg.sender);
+        setRegistry(registryAddress);
+        setTobinTaxStalenessThreshold(_tobinTaxStalenessThreshold);
+        setDailySpendingRatio(_spendingRatioForCelo);
+        setFrozenGold(_frozenGold, _frozenDays);
+        setAssetAllocations(_assetAllocationSymbols, _assetAllocationWeights);
+        setTobinTax(_tobinTax);
+        setTobinTaxReserveRatio(_tobinTaxReserveRatio);
+        for (uint256 i = 0; i < _collateralAssets.length; i++) {
+            addCollateralAsset(_collateralAssets[i]);
+        }
+        setDailySpendingRatioForCollateralAssets(
+            _collateralAssets,
+            _collateralAssetDailySpendingRatios
+        );
+    }
+
+    /**
+     * @notice Sets the number of seconds to cache the tobin tax value for.
+     * @param value The number of seconds to cache the tobin tax value for.
+     */
+    function setTobinTaxStalenessThreshold(uint256 value) public onlyOwner {
+        require(value > 0, "value was zero");
+        tobinTaxStalenessThreshold = value;
+        emit TobinTaxStalenessThresholdSet(value);
+    }
+
+    /**
+     * @notice Sets the tobin tax.
+     * @param value The tobin tax.
+     */
+    function setTobinTax(uint256 value) public onlyOwner {
         require(
-          checkIsCollateralAsset(_collateralAssets[i]),
-          "the address specified is not a reserve collateral asset"
+            FixidityLib.wrap(value).lte(FixidityLib.fixed1()),
+            "tobin tax cannot be larger than 1"
         );
+        tobinTax = value;
+        emit TobinTaxSet(value);
+    }
+
+    /**
+     * @notice Sets the reserve ratio at which the tobin tax sets in.
+     * @param value The reserve ratio at which the tobin tax sets in.
+     */
+    function setTobinTaxReserveRatio(uint256 value) public onlyOwner {
+        tobinTaxReserveRatio = value;
+        emit TobinTaxReserveRatioSet(value);
+    }
+
+    /**
+     * @notice Set the ratio of reserve that is spendable per day.
+     * @param ratio Spending ratio as unwrapped Fraction.
+     */
+    function setDailySpendingRatio(uint256 ratio) public onlyOwner {
+        spendingRatio = FixidityLib.wrap(ratio);
         require(
-          FixidityLib.wrap(collateralAssetDailySpendingRatios[i]).lte(FixidityLib.fixed1()),
-          "spending ratio cannot be larger than 1"
+            spendingRatio.lte(FixidityLib.fixed1()),
+            "spending ratio cannot be larger than 1"
         );
-        collateralAssetDailySpendingRatio[_collateralAssets[i]] = FixidityLib.wrap(
-          collateralAssetDailySpendingRatios[i]
+        emit DailySpendingRatioSet(ratio);
+    }
+
+    /**
+     * @notice Set the ratio of reserve for a given collateral asset
+     * that is spendable per day.
+     * @param _collateralAssets Collection of the addresses of collateral assets
+     * we're setting a limit for.
+     * @param collateralAssetDailySpendingRatios Collection of the relative daily spending limits
+     * of collateral assets.
+     */
+    function setDailySpendingRatioForCollateralAssets(
+        address[] memory _collateralAssets,
+        uint256[] memory collateralAssetDailySpendingRatios
+    ) public onlyOwner {
+        require(
+            _collateralAssets.length ==
+                collateralAssetDailySpendingRatios.length,
+            "token addresses and spending ratio lengths have to be the same"
         );
-        emit DailySpendingRatioForCollateralAssetSet(_collateralAssets[i], collateralAssetDailySpendingRatios[i]);
-      }
-    }
-  }
-
-  /**
-   * @notice Get daily spending ratio.
-   * @return Spending ratio as unwrapped Fraction.
-   */
-  function getDailySpendingRatio() public view returns (uint256) {
-    return spendingRatio.unwrap();
-  }
-
-  /**
-   * @notice Get daily spending ratio of a collateral asset.
-   * @param collateralAsset The address of a collateral asset we're getting a spending ratio for.
-   * @return Daily spending ratio for the collateral asset as unwrapped Fraction.
-   */
-  function getDailySpendingRatioForCollateralAsset(address collateralAsset) public view returns (uint256) {
-    return collateralAssetDailySpendingRatio[collateralAsset].unwrap();
-  }
-
-  /**
-   * @notice Sets the balance of reserve gold frozen from transfer.
-   * @param frozenGold The amount of CELO frozen.
-   * @param frozenDays The number of days the frozen CELO thaws over.
-   */
-  function setFrozenGold(uint256 frozenGold, uint256 frozenDays) public onlyOwner {
-    require(frozenGold <= address(this).balance, "Cannot freeze more than balance");
-    frozenReserveGoldStartBalance = frozenGold;
-    // slither-disable-start events-maths
-    frozenReserveGoldStartDay = now / 1 days;
-    frozenReserveGoldDays = frozenDays;
-    // slither-disable-end events-maths
-  }
-
-  /**
-   * @notice Sets target allocations for CELO and a diversified basket of non-Celo assets.
-   * @param symbols The symbol of each asset in the Reserve portfolio.
-   * @param weights The weight for the corresponding asset as unwrapped Fixidity.Fraction.
-   */
-  function setAssetAllocations(bytes32[] memory symbols, uint256[] memory weights) public onlyOwner {
-    require(symbols.length == weights.length, "Array length mismatch");
-    FixidityLib.Fraction memory sum = FixidityLib.wrap(0);
-    for (uint256 i = 0; i < weights.length; i = i.add(1)) {
-      sum = sum.add(FixidityLib.wrap(weights[i]));
-    }
-    require(sum.equals(FixidityLib.fixed1()), "Sum of asset allocation must be 1");
-    // slither-disable-next-line cache-array-length
-    for (uint256 i = 0; i < assetAllocationSymbols.length; i = i.add(1)) {
-      delete assetAllocationWeights[assetAllocationSymbols[i]];
-    }
-    assetAllocationSymbols = symbols;
-    for (uint256 i = 0; i < symbols.length; i = i.add(1)) {
-      require(assetAllocationWeights[symbols[i]] == 0, "Cannot set weight twice");
-      assetAllocationWeights[symbols[i]] = weights[i];
-    }
-    // NOTE: The CELO asset launched as "Celo Gold" (cGLD), but was renamed to
-    // just CELO by the community.
-    // TODO: Change "cGLD" to "CELO" in this file, after ensuring that any
-    // off chain tools working with asset allocation weights are aware of this
-    // change.
-    require(assetAllocationWeights["cGLD"] != 0, "Must set cGLD asset weight");
-    emit AssetAllocationSet(symbols, weights);
-  }
-
-  /**
-   * @notice Add a token that the reserve will stabilize.
-   * @param token The address of the token being stabilized.
-   * @return Returns true if the transaction succeeds.
-   */
-  function addToken(address token) external onlyOwner returns (bool) {
-    require(!isToken[token], "token addr already registered");
-    isToken[token] = true;
-    _tokens.push(token);
-    emit TokenAdded(token);
-    return true;
-  }
-
-  /**
-   * @notice Remove a token that the reserve will no longer stabilize.
-   * @param token The address of the token no longer being stabilized.
-   * @param index The index of the token in _tokens.
-   * @return Returns true if the transaction succeeds.
-   */
-  function removeToken(address token, uint256 index) external onlyOwner isStableToken(token) returns (bool) {
-    require(index < _tokens.length && _tokens[index] == token, "index into tokens list not mapped to token");
-    isToken[token] = false;
-    address lastItem = _tokens[_tokens.length.sub(1)];
-    _tokens[index] = lastItem;
-    _tokens.length = _tokens.length.sub(1);
-    emit TokenRemoved(token, index);
-    return true;
-  }
-
-  /**
-   * @notice Add a reserve address whose balance shall be included in the reserve ratio.
-   * @param reserveAddress The reserve address to add.
-   * @return Returns true if the transaction succeeds.
-   */
-  function addOtherReserveAddress(address reserveAddress) external onlyOwner returns (bool) {
-    require(!isOtherReserveAddress[reserveAddress], "reserve addr already added");
-    isOtherReserveAddress[reserveAddress] = true;
-    otherReserveAddresses.push(reserveAddress);
-    emit OtherReserveAddressAdded(reserveAddress);
-    return true;
-  }
-
-  /**
-   * @notice Remove reserve address whose balance shall no longer be included in the reserve ratio.
-   * @param reserveAddress The reserve address to remove.
-   * @param index The index of the reserve address in otherReserveAddresses.
-   * @return Returns true if the transaction succeeds.
-   */
-  function removeOtherReserveAddress(address reserveAddress, uint256 index) external onlyOwner returns (bool) {
-    require(isOtherReserveAddress[reserveAddress], "reserve addr was never added");
-    require(
-      index < otherReserveAddresses.length && otherReserveAddresses[index] == reserveAddress,
-      "index into reserve list not mapped to address"
-    );
-    isOtherReserveAddress[reserveAddress] = false;
-    address lastItem = otherReserveAddresses[otherReserveAddresses.length.sub(1)];
-    otherReserveAddresses[index] = lastItem;
-    otherReserveAddresses.length = otherReserveAddresses.length.sub(1);
-    emit OtherReserveAddressRemoved(reserveAddress, index);
-    return true;
-  }
-
-  /**
-   * @notice Gives an address permission to spend Reserve funds.
-   * @param spender The address that is allowed to spend Reserve funds.
-   */
-  function addSpender(address spender) external onlyOwner {
-    require(address(0) != spender, "Spender can't be null");
-    isSpender[spender] = true;
-    emit SpenderAdded(spender);
-  }
-
-  /**
-   * @notice Takes away an address's permission to spend Reserve funds.
-   * @param spender The address that is to be no longer allowed to spend Reserve funds.
-   */
-  function removeSpender(address spender) external onlyOwner {
-    require(isSpender[spender], "Spender hasn't been added");
-    isSpender[spender] = false;
-    emit SpenderRemoved(spender);
-  }
-
-  /**
-   * @notice Checks if an address is able to spend as an exchange.
-   * @dev isExchangeSpender was introduced after cUSD, so the cUSD Exchange is not included in it.
-   * If cUSD's Exchange were to be added to isExchangeSpender, the check with the
-   * registry could be removed.
-   * @param spender The address to be checked.
-   */
-  modifier isAllowedToSpendExchange(address spender) {
-    require(
-      isExchangeSpender[spender] || (registry.getAddressForOrDie(EXCHANGE_REGISTRY_ID) == spender),
-      "Address not allowed to spend"
-    );
-    _;
-  }
-
-  /**
-   * @notice Gives an address permission to spend Reserve without limit.
-   * @param spender The address that is allowed to spend Reserve funds.
-   */
-  function addExchangeSpender(address spender) external onlyOwner {
-    require(address(0) != spender, "Spender can't be null");
-    require(!isExchangeSpender[spender], "Address is already Exchange Spender");
-    isExchangeSpender[spender] = true;
-    exchangeSpenderAddresses.push(spender);
-    emit ExchangeSpenderAdded(spender);
-  }
-
-  /**
-   * @notice Takes away an address's permission to spend Reserve funds without limits.
-   * @param spender The address that is to be no longer allowed to spend Reserve funds.
-   * @param index The index in exchangeSpenderAddresses of spender.
-   */
-  function removeExchangeSpender(address spender, uint256 index) external onlyOwner {
-    isExchangeSpender[spender] = false;
-    uint256 numAddresses = exchangeSpenderAddresses.length;
-    require(index < numAddresses, "Index is invalid");
-    require(spender == exchangeSpenderAddresses[index], "Index does not match spender");
-    uint256 newNumAddresses = numAddresses.sub(1);
-
-    if (index != newNumAddresses) {
-      exchangeSpenderAddresses[index] = exchangeSpenderAddresses[newNumAddresses];
-    }
-
-    exchangeSpenderAddresses[newNumAddresses] = address(0x0);
-    exchangeSpenderAddresses.length = newNumAddresses;
-    emit ExchangeSpenderRemoved(spender);
-  }
-
-  /**
-   * @notice Returns addresses of exchanges permitted to spend Reserve funds.
-   * Because exchangeSpenderAddresses was introduced after cUSD, cUSD's exchange
-   * is not included in this list.
-   * @return An array of addresses permitted to spend Reserve funds.
-   */
-  function getExchangeSpenders() external view returns (address[] memory) {
-    return exchangeSpenderAddresses;
-  }
-
-  /**
-   * @notice Transfer gold to a whitelisted address subject to reserve spending limits.
-   * @param to The address that will receive the gold.
-   * @param value The amount of gold to transfer.
-   * @return Returns true if the transaction succeeds.
-   */
-  function transferGold(address payable to, uint256 value) external returns (bool) {
-    require(isSpender[msg.sender], "sender not allowed to transfer Reserve funds");
-    require(isOtherReserveAddress[to], "can only transfer to other reserve address");
-    uint256 currentDay = now / 1 days;
-    if (currentDay > lastSpendingDay) {
-      uint256 balance = getUnfrozenReserveGoldBalance();
-      lastSpendingDay = currentDay;
-      spendingLimit = spendingRatio.multiply(FixidityLib.newFixed(balance)).fromFixed();
-    }
-    require(spendingLimit >= value, "Exceeding spending limit");
-    spendingLimit = spendingLimit.sub(value);
-    return _transferGold(to, value);
-  }
-
-  /**
-   * @notice Transfer collateral asset subject to reserve spending limits to the trader,
-   * if the limit is set, othersise the limit is 100%.
-   * @param collateralAsset The token address you're transferring.
-   * @param to The address that will receive the funds.
-   * @param value The amount of collateral assets to transfer.
-   * @return Returns true if the transaction succeeds.
-   */
-  function transferCollateralAsset(address collateralAsset, address payable to, uint256 value) external returns (bool) {
-    require(isSpender[msg.sender], "sender not allowed to transfer Reserve funds");
-    require(isOtherReserveAddress[to], "can only transfer to other reserve address");
-    require(
-      getDailySpendingRatioForCollateralAsset(collateralAsset) > 0,
-      "this asset has no spending ratio, therefore can't be transferred"
-    );
-    uint256 currentDay = now / 1 days;
-    if (currentDay > collateralAssetLastSpendingDay[collateralAsset]) {
-      uint256 balance = getReserveAddressesCollateralAssetBalance(collateralAsset);
-      collateralAssetLastSpendingDay[collateralAsset] = currentDay;
-      collateralAssetSpendingLimit[collateralAsset] = collateralAssetDailySpendingRatio[collateralAsset]
-        .multiply(FixidityLib.newFixed(balance))
-        .fromFixed();
-    }
-    uint256 spendingLimitForThisAsset = collateralAssetSpendingLimit[collateralAsset];
-    require(spendingLimitForThisAsset >= value, "Exceeding spending limit");
-
-    collateralAssetSpendingLimit[collateralAsset] = spendingLimitForThisAsset.sub(value);
-    return _transferCollateralAsset(collateralAsset, to, value);
-  }
-
-  /**
-   * @notice Transfer collateral asset to any address.
-   * @param collateralAsset The token address you're transferring.
-   * @param to The address that will receive the funds.
-   * @param value The amount of collateral assets to transfer.
-   * @return Returns true if the transaction succeeds.
-   */
-  function _transferCollateralAsset(
-    address collateralAsset,
-    address payable to,
-    uint256 value
-  ) internal returns (bool) {
-    require(value <= getReserveAddressesCollateralAssetBalance(collateralAsset), "Exceeding the amount reserve holds");
-    // slither-disable-next-line reentrancy-events
-    IERC20(collateralAsset).safeTransfer(to, value);
-    emit ReserveCollateralAssetsTransferred(msg.sender, to, value, collateralAsset);
-    return true;
-  }
-
-  /**
-   * @notice Transfer collateral asset to any address.
-   * @dev Transfers are not subject to a daily spending limit.
-   * @param collateralAsset The address of collateral asset being transferred.
-   * @param to The address that will receive the collateral asset.
-   * @param value The amount of collateral asset to transfer.
-   * @return Returns true if the transaction succeeds.
-   */
-  function transferExchangeCollateralAsset(
-    address collateralAsset,
-    address payable to,
-    uint256 value
-  ) external returns (bool) {
-    require(isExchangeSpender[msg.sender], "Address not allowed to spend");
-    return _transferCollateralAsset(collateralAsset, to, value);
-  }
-
-  /**
-   * @notice Transfer unfrozen gold to any address.
-   * @param to The address that will receive the gold.
-   * @param value The amount of gold to transfer.
-   * @return Returns true if the transaction succeeds.
-   */
-  function _transferGold(address payable to, uint256 value) internal returns (bool) {
-    require(value <= getUnfrozenBalance(), "Exceeding unfrozen reserves");
-    // slither-disable-next-line reentrancy-events
-    to.sendValue(value);
-    emit ReserveGoldTransferred(msg.sender, to, value);
-    return true;
-  }
-
-  /**
-   * @notice Transfer unfrozen gold to any address, used for one side of CP-DOTO.
-   * @dev Transfers are not subject to a daily spending limit.
-   * @param to The address that will receive the gold.
-   * @param value The amount of gold to transfer.
-   * @return Returns true if the transaction succeeds.
-   */
-  function transferExchangeGold(
-    address payable to,
-    uint256 value
-  ) external isAllowedToSpendExchange(msg.sender) returns (bool) {
-    return _transferGold(to, value);
-  }
-
-  /**
-   * @notice Returns the tobin tax, recomputing it if it's stale.
-   * @return The numerator - tobin tax amount as a fraction.
-   * @return The denominator - tobin tax amount as a fraction.
-   */
-  function getOrComputeTobinTax() external nonReentrant returns (uint256, uint256) {
-    // solhint-disable-next-line not-rely-on-time
-    if (now.sub(tobinTaxCache.timestamp) > tobinTaxStalenessThreshold) {
-      tobinTaxCache.numerator = uint128(computeTobinTax().unwrap());
-      tobinTaxCache.timestamp = uint128(now); // solhint-disable-line not-rely-on-time
-    }
-    return (uint256(tobinTaxCache.numerator), FixidityLib.fixed1().unwrap());
-  }
-
-  /**
-   * @notice Returns the list of stabilized token addresses.
-   * @return An array of addresses of stabilized tokens.
-   */
-  function getTokens() external view returns (address[] memory) {
-    return _tokens;
-  }
-
-  /**
-   * @notice Returns the list other addresses included in the reserve total.
-   * @return An array of other addresses included in the reserve total.
-   */
-  function getOtherReserveAddresses() external view returns (address[] memory) {
-    return otherReserveAddresses;
-  }
-
-  /**
-   * @notice Returns a list of token symbols that have been allocated.
-   * @return An array of token symbols that have been allocated.
-   */
-  function getAssetAllocationSymbols() external view returns (bytes32[] memory) {
-    return assetAllocationSymbols;
-  }
-
-  /**
-   * @notice Returns a list of weights used for the allocation of reserve assets.
-   * @return An array of a list of weights used for the allocation of reserve assets.
-   */
-  function getAssetAllocationWeights() external view returns (uint256[] memory) {
-    uint256[] memory weights = new uint256[](assetAllocationSymbols.length);
-    // slither-disable-next-line cache-array-length
-    for (uint256 i = 0; i < assetAllocationSymbols.length; i = i.add(1)) {
-      weights[i] = assetAllocationWeights[assetAllocationSymbols[i]];
-    }
-    return weights;
-  }
-
-  /**
-   * @notice Returns the amount of unfrozen CELO in the reserve.
-   * @return The total unfrozen CELO in the reserve.
-   */
-  function getUnfrozenBalance() public view returns (uint256) {
-    uint256 balance = address(this).balance;
-    uint256 frozenReserveGold = getFrozenReserveGoldBalance();
-    return balance > frozenReserveGold ? balance.sub(frozenReserveGold) : 0;
-  }
-
-  /**
-   * @notice Returns the amount of CELO included in the reserve.
-   * @return The CELO amount included in the reserve.
-   */
-  function getReserveGoldBalance() public view returns (uint256) {
-    return address(this).balance.add(getOtherReserveAddressesGoldBalance());
-  }
-
-  /**
-   * @notice Returns the amount of CELO included in other reserve addresses.
-   * @return The CELO amount included in other reserve addresses.
-   */
-  function getOtherReserveAddressesGoldBalance() public view returns (uint256) {
-    uint256 reserveGoldBalance = 0;
-    // slither-disable-next-line cache-array-length
-    for (uint256 i = 0; i < otherReserveAddresses.length; i = i.add(1)) {
-      reserveGoldBalance = reserveGoldBalance.add(otherReserveAddresses[i].balance);
-    }
-    return reserveGoldBalance;
-  }
-
-  /**
-   * @notice Returns the amount of unfrozen CELO included in the reserve.
-   * @return The unfrozen CELO amount included in the reserve.
-   */
-  function getUnfrozenReserveGoldBalance() public view returns (uint256) {
-    return getUnfrozenBalance().add(getOtherReserveAddressesGoldBalance());
-  }
-
-  /**
-   * @notice Returns the amount of particular collateral asset
-   * in reserve including other reserve addresses.
-   * @param collateralAsset the asset we're checking a balance of
-   * @return The balance of particular collateral asset.
-   */
-  function getReserveAddressesCollateralAssetBalance(address collateralAsset) public view returns (uint256) {
-    require(checkIsCollateralAsset(collateralAsset), "specified address is not a collateral asset");
-    uint256 reserveCollateralAssetBalance = 0;
-    // slither-disable-next-line cache-array-length
-    for (uint256 i = 0; i < otherReserveAddresses.length; i++) {
-      // slither-disable-next-line calls-loop
-      reserveCollateralAssetBalance = reserveCollateralAssetBalance.add(
-        IERC20(collateralAsset).balanceOf(otherReserveAddresses[i])
-      );
-    }
-    return reserveCollateralAssetBalance.add(IERC20(collateralAsset).balanceOf(address(this)));
-  }
-
-  /**
-   * @notice Add a collateral asset in the reserve.
-   * @param collateralAsset The address of the token being added.
-   * @return Returns true if the transaction succeeds.
-   */
-  function addCollateralAsset(address collateralAsset) public onlyOwner returns (bool) {
-    require(!checkIsCollateralAsset(collateralAsset), "specified address is already added as a collateral asset");
-    require(collateralAsset != address(0), "can't be a zero address");
-    isCollateralAsset[collateralAsset] = true;
-    collateralAssets.push(collateralAsset);
-    emit CollateralAssetAdded(collateralAsset);
-    return true;
-  }
-
-  /**
-   * @notice Remove a collateral asset in the reserve.
-   * @param collateralAsset The address of the token being removed.
-   * @param index The index of the token being removed.
-   * @return Returns true if the transaction succeeds.
-   */
-  function removeCollateralAsset(address collateralAsset, uint256 index) external onlyOwner returns (bool) {
-    require(checkIsCollateralAsset(collateralAsset), "specified address is not a collateral asset");
-    require(
-      index < collateralAssets.length && collateralAssets[index] == collateralAsset,
-      "index into collateralAssets list not mapped to token"
-    );
-    collateralAssets[index] = collateralAssets[collateralAssets.length.sub(1)];
-    collateralAssets.pop();
-    delete isCollateralAsset[collateralAsset];
-    emit CollateralAssetRemoved(collateralAsset);
-    return true;
-  }
-
-  /**
-   * @notice Check if a collateral asset is added to the reserve.
-   * @param collateralAsset The address of the token being checked.
-   * @return Returns true if the token was added as a collateral asset.
-   */
-  function checkIsCollateralAsset(address collateralAsset) public view returns (bool) {
-    return isCollateralAsset[collateralAsset];
-  }
-
-  /**
-   * @notice Returns the amount of frozen CELO in the reserve.
-   * @return The total frozen CELO in the reserve.
-   */
-  function getFrozenReserveGoldBalance() public view returns (uint256) {
-    uint256 currentDay = now / 1 days;
-    uint256 frozenDays = currentDay.sub(frozenReserveGoldStartDay);
-    if (frozenDays >= frozenReserveGoldDays) return 0;
-    return frozenReserveGoldStartBalance.sub(frozenReserveGoldStartBalance.mul(frozenDays).div(frozenReserveGoldDays));
-  }
-
-  /**
-   * @notice Computes the ratio of current reserve balance to total stable token valuation.
-   * @return Reserve ratio in a fixed point format.
-   */
-  function getReserveRatio() public view returns (uint256) {
-    address sortedOraclesAddress = registry.getAddressForOrDie(SORTED_ORACLES_REGISTRY_ID);
-    ISortedOracles sortedOracles = ISortedOracles(sortedOraclesAddress);
-    uint256 reserveGoldBalance = getUnfrozenReserveGoldBalance();
-    uint256 stableTokensValueInGold = 0;
-    FixidityLib.Fraction memory cgldWeight = FixidityLib.wrap(assetAllocationWeights["cGLD"]);
-
-    // slither-disable-next-line cache-array-length
-    for (uint256 i = 0; i < _tokens.length; i = i.add(1)) {
-      uint256 stableAmount;
-      uint256 goldAmount;
-      // slither-disable-next-line calls-loop
-      (stableAmount, goldAmount) = sortedOracles.medianRate(_tokens[i]);
-
-      if (goldAmount != 0) {
-        // tokens with no oracle reports don't count towards collateralization ratio
-        // slither-disable-next-line calls-loop
-        uint256 stableTokenSupply = IERC20(_tokens[i]).totalSupply();
-        uint256 aStableTokenValueInGold = stableTokenSupply.mul(goldAmount).div(stableAmount);
-        stableTokensValueInGold = stableTokensValueInGold.add(aStableTokenValueInGold);
-      }
-    }
-    return
-      FixidityLib
-        .newFixed(reserveGoldBalance)
-        .divide(cgldWeight)
-        .divide(FixidityLib.newFixed(stableTokensValueInGold))
-        .unwrap();
-  }
-
-  /*
-   * Internal functions
-   */
-
-  /**
-   * @notice Computes a tobin tax based on the reserve ratio.
-   * @return The tobin tax expresesed as a fixidity fraction.
-   */
-  function computeTobinTax() private view returns (FixidityLib.Fraction memory) {
-    FixidityLib.Fraction memory ratio = FixidityLib.wrap(getReserveRatio());
-    if (ratio.gte(FixidityLib.wrap(tobinTaxReserveRatio))) {
-      return FixidityLib.wrap(0);
-    } else {
-      return FixidityLib.wrap(tobinTax);
-    }
-  }
-
-  function isStableAsset(address token) external view returns (bool) {
-    return isToken[token];
-  }
+        for (uint256 i = 0; i < _collateralAssets.length; i++) {
+            if (
+                _collateralAssets[i] != address(0) &&
+                collateralAssetDailySpendingRatios[i] != 0
+            ) {
+                require(
+                    checkIsCollateralAsset(_collateralAssets[i]),
+                    "the address specified is not a reserve collateral asset"
+                );
+                require(
+                    FixidityLib.wrap(collateralAssetDailySpendingRatios[i]).lte(
+                        FixidityLib.fixed1()
+                    ),
+                    "spending ratio cannot be larger than 1"
+                );
+                collateralAssetDailySpendingRatio[
+                    _collateralAssets[i]
+                ] = FixidityLib.wrap(collateralAssetDailySpendingRatios[i]);
+                emit DailySpendingRatioForCollateralAssetSet(
+                    _collateralAssets[i],
+                    collateralAssetDailySpendingRatios[i]
+                );
+            }
+        }
+    }
+
+    /**
+     * @notice Get daily spending ratio.
+     * @return Spending ratio as unwrapped Fraction.
+     */
+    function getDailySpendingRatio() public view returns (uint256) {
+        return spendingRatio.unwrap();
+    }
+
+    /**
+     * @notice Get daily spending ratio of a collateral asset.
+     * @param collateralAsset The address of a collateral asset we're getting a spending ratio for.
+     * @return Daily spending ratio for the collateral asset as unwrapped Fraction.
+     */
+    function getDailySpendingRatioForCollateralAsset(
+        address collateralAsset
+    ) public view returns (uint256) {
+        return collateralAssetDailySpendingRatio[collateralAsset].unwrap();
+    }
+
+    /**
+     * @notice Sets the balance of reserve gold frozen from transfer.
+     * @param frozenGold The amount of CELO frozen.
+     * @param frozenDays The number of days the frozen CELO thaws over.
+     */
+    function setFrozenGold(
+        uint256 frozenGold,
+        uint256 frozenDays
+    ) public onlyOwner {
+        require(
+            frozenGold <= address(this).balance,
+            "Cannot freeze more than balance"
+        );
+        frozenReserveGoldStartBalance = frozenGold;
+        // slither-disable-start events-maths
+        frozenReserveGoldStartDay = now / 1 days;
+        frozenReserveGoldDays = frozenDays;
+        // slither-disable-end events-maths
+    }
+
+    /**
+     * @notice Sets target allocations for CELO and a diversified basket of non-Celo assets.
+     * @param symbols The symbol of each asset in the Reserve portfolio.
+     * @param weights The weight for the corresponding asset as unwrapped Fixidity.Fraction.
+     */
+    function setAssetAllocations(
+        bytes32[] memory symbols,
+        uint256[] memory weights
+    ) public onlyOwner {
+        require(symbols.length == weights.length, "Array length mismatch");
+        FixidityLib.Fraction memory sum = FixidityLib.wrap(0);
+        for (uint256 i = 0; i < weights.length; i = i.add(1)) {
+            sum = sum.add(FixidityLib.wrap(weights[i]));
+        }
+        require(
+            sum.equals(FixidityLib.fixed1()),
+            "Sum of asset allocation must be 1"
+        );
+        // slither-disable-next-line cache-array-length
+        for (uint256 i = 0; i < assetAllocationSymbols.length; i = i.add(1)) {
+            delete assetAllocationWeights[assetAllocationSymbols[i]];
+        }
+        assetAllocationSymbols = symbols;
+        for (uint256 i = 0; i < symbols.length; i = i.add(1)) {
+            require(
+                assetAllocationWeights[symbols[i]] == 0,
+                "Cannot set weight twice"
+            );
+            assetAllocationWeights[symbols[i]] = weights[i];
+        }
+        // NOTE: The CELO asset launched as "Celo Gold" (cGLD), but was renamed to
+        // just CELO by the community.
+        // TODO: Change "cGLD" to "CELO" in this file, after ensuring that any
+        // off chain tools working with asset allocation weights are aware of this
+        // change.
+        require(
+            assetAllocationWeights["cGLD"] != 0,
+            "Must set cGLD asset weight"
+        );
+        emit AssetAllocationSet(symbols, weights);
+    }
+
+    /**
+     * @notice Add a token that the reserve will stabilize.
+     * @param token The address of the token being stabilized.
+     * @return Returns true if the transaction succeeds.
+     */
+    function addToken(address token) external onlyOwner returns (bool) {
+        require(!isToken[token], "token addr already registered");
+        isToken[token] = true;
+        _tokens.push(token);
+        emit TokenAdded(token);
+        return true;
+    }
+
+    /**
+     * @notice Remove a token that the reserve will no longer stabilize.
+     * @param token The address of the token no longer being stabilized.
+     * @param index The index of the token in _tokens.
+     * @return Returns true if the transaction succeeds.
+     */
+    function removeToken(
+        address token,
+        uint256 index
+    ) external onlyOwner isStableToken(token) returns (bool) {
+        require(
+            index < _tokens.length && _tokens[index] == token,
+            "index into tokens list not mapped to token"
+        );
+        isToken[token] = false;
+        address lastItem = _tokens[_tokens.length.sub(1)];
+        _tokens[index] = lastItem;
+        _tokens.length = _tokens.length.sub(1);
+        emit TokenRemoved(token, index);
+        return true;
+    }
+
+    /**
+     * @notice Add a reserve address whose balance shall be included in the reserve ratio.
+     * @param reserveAddress The reserve address to add.
+     * @return Returns true if the transaction succeeds.
+     */
+    function addOtherReserveAddress(
+        address reserveAddress
+    ) external onlyOwner returns (bool) {
+        require(
+            !isOtherReserveAddress[reserveAddress],
+            "reserve addr already added"
+        );
+        isOtherReserveAddress[reserveAddress] = true;
+        otherReserveAddresses.push(reserveAddress);
+        emit OtherReserveAddressAdded(reserveAddress);
+        return true;
+    }
+
+    /**
+     * @notice Remove reserve address whose balance shall no longer be included in the reserve ratio.
+     * @param reserveAddress The reserve address to remove.
+     * @param index The index of the reserve address in otherReserveAddresses.
+     * @return Returns true if the transaction succeeds.
+     */
+    function removeOtherReserveAddress(
+        address reserveAddress,
+        uint256 index
+    ) external onlyOwner returns (bool) {
+        require(
+            isOtherReserveAddress[reserveAddress],
+            "reserve addr was never added"
+        );
+        require(
+            index < otherReserveAddresses.length &&
+                otherReserveAddresses[index] == reserveAddress,
+            "index into reserve list not mapped to address"
+        );
+        isOtherReserveAddress[reserveAddress] = false;
+        address lastItem = otherReserveAddresses[
+            otherReserveAddresses.length.sub(1)
+        ];
+        otherReserveAddresses[index] = lastItem;
+        otherReserveAddresses.length = otherReserveAddresses.length.sub(1);
+        emit OtherReserveAddressRemoved(reserveAddress, index);
+        return true;
+    }
+
+    /**
+     * @notice Gives an address permission to spend Reserve funds.
+     * @param spender The address that is allowed to spend Reserve funds.
+     */
+    function addSpender(address spender) external onlyOwner {
+        require(address(0) != spender, "Spender can't be null");
+        isSpender[spender] = true;
+        emit SpenderAdded(spender);
+    }
+
+    /**
+     * @notice Takes away an address's permission to spend Reserve funds.
+     * @param spender The address that is to be no longer allowed to spend Reserve funds.
+     */
+    function removeSpender(address spender) external onlyOwner {
+        require(isSpender[spender], "Spender hasn't been added");
+        isSpender[spender] = false;
+        emit SpenderRemoved(spender);
+    }
+
+    /**
+     * @notice Checks if an address is able to spend as an exchange.
+     * @dev isExchangeSpender was introduced after cUSD, so the cUSD Exchange is not included in it.
+     * If cUSD's Exchange were to be added to isExchangeSpender, the check with the
+     * registry could be removed.
+     * @param spender The address to be checked.
+     */
+    modifier isAllowedToSpendExchange(address spender) {
+        require(
+            isExchangeSpender[spender] ||
+                (registry.getAddressForOrDie(EXCHANGE_REGISTRY_ID) == spender),
+            "Address not allowed to spend"
+        );
+        _;
+    }
+
+    /**
+     * @notice Gives an address permission to spend Reserve without limit.
+     * @param spender The address that is allowed to spend Reserve funds.
+     */
+    function addExchangeSpender(address spender) external onlyOwner {
+        require(address(0) != spender, "Spender can't be null");
+        require(
+            !isExchangeSpender[spender],
+            "Address is already Exchange Spender"
+        );
+        isExchangeSpender[spender] = true;
+        exchangeSpenderAddresses.push(spender);
+        emit ExchangeSpenderAdded(spender);
+    }
+
+    /**
+     * @notice Takes away an address's permission to spend Reserve funds without limits.
+     * @param spender The address that is to be no longer allowed to spend Reserve funds.
+     * @param index The index in exchangeSpenderAddresses of spender.
+     */
+    function removeExchangeSpender(
+        address spender,
+        uint256 index
+    ) external onlyOwner {
+        isExchangeSpender[spender] = false;
+        uint256 numAddresses = exchangeSpenderAddresses.length;
+        require(index < numAddresses, "Index is invalid");
+        require(
+            spender == exchangeSpenderAddresses[index],
+            "Index does not match spender"
+        );
+        uint256 newNumAddresses = numAddresses.sub(1);
+
+        if (index != newNumAddresses) {
+            exchangeSpenderAddresses[index] = exchangeSpenderAddresses[
+                newNumAddresses
+            ];
+        }
+
+        exchangeSpenderAddresses[newNumAddresses] = address(0x0);
+        exchangeSpenderAddresses.length = newNumAddresses;
+        emit ExchangeSpenderRemoved(spender);
+    }
+
+    /**
+     * @notice Returns addresses of exchanges permitted to spend Reserve funds.
+     * Because exchangeSpenderAddresses was introduced after cUSD, cUSD's exchange
+     * is not included in this list.
+     * @return An array of addresses permitted to spend Reserve funds.
+     */
+    function getExchangeSpenders() external view returns (address[] memory) {
+        return exchangeSpenderAddresses;
+    }
+
+    /**
+     * @notice Transfer gold to a whitelisted address subject to reserve spending limits.
+     * @param to The address that will receive the gold.
+     * @param value The amount of gold to transfer.
+     * @return Returns true if the transaction succeeds.
+     */
+    function transferGold(
+        address payable to,
+        uint256 value
+    ) external returns (bool) {
+        require(
+            isSpender[msg.sender],
+            "sender not allowed to transfer Reserve funds"
+        );
+        require(
+            isOtherReserveAddress[to],
+            "can only transfer to other reserve address"
+        );
+        uint256 currentDay = now / 1 days;
+        if (currentDay > lastSpendingDay) {
+            uint256 balance = getUnfrozenReserveGoldBalance();
+            lastSpendingDay = currentDay;
+            spendingLimit = spendingRatio
+                .multiply(FixidityLib.newFixed(balance))
+                .fromFixed();
+        }
+        require(spendingLimit >= value, "Exceeding spending limit");
+        spendingLimit = spendingLimit.sub(value);
+        return _transferGold(to, value);
+    }
+
+    /**
+     * @notice Transfer collateral asset subject to reserve spending limits to the trader,
+     * if the limit is set, othersise the limit is 100%.
+     * @param collateralAsset The token address you're transferring.
+     * @param to The address that will receive the funds.
+     * @param value The amount of collateral assets to transfer.
+     * @return Returns true if the transaction succeeds.
+     */
+    function transferCollateralAsset(
+        address collateralAsset,
+        address payable to,
+        uint256 value
+    ) external returns (bool) {
+        require(
+            isSpender[msg.sender],
+            "sender not allowed to transfer Reserve funds"
+        );
+        require(
+            isOtherReserveAddress[to],
+            "can only transfer to other reserve address"
+        );
+        require(
+            getDailySpendingRatioForCollateralAsset(collateralAsset) > 0,
+            "this asset has no spending ratio, therefore can't be transferred"
+        );
+        uint256 currentDay = now / 1 days;
+        if (currentDay > collateralAssetLastSpendingDay[collateralAsset]) {
+            uint256 balance = getReserveAddressesCollateralAssetBalance(
+                collateralAsset
+            );
+            collateralAssetLastSpendingDay[collateralAsset] = currentDay;
+            collateralAssetSpendingLimit[
+                collateralAsset
+            ] = collateralAssetDailySpendingRatio[collateralAsset]
+                .multiply(FixidityLib.newFixed(balance))
+                .fromFixed();
+        }
+        uint256 spendingLimitForThisAsset = collateralAssetSpendingLimit[
+            collateralAsset
+        ];
+        require(spendingLimitForThisAsset >= value, "Exceeding spending limit");
+
+        collateralAssetSpendingLimit[
+            collateralAsset
+        ] = spendingLimitForThisAsset.sub(value);
+        return _transferCollateralAsset(collateralAsset, to, value);
+    }
+
+    /**
+     * @notice Transfer collateral asset to any address.
+     * @param collateralAsset The token address you're transferring.
+     * @param to The address that will receive the funds.
+     * @param value The amount of collateral assets to transfer.
+     * @return Returns true if the transaction succeeds.
+     */
+    function _transferCollateralAsset(
+        address collateralAsset,
+        address payable to,
+        uint256 value
+    ) internal returns (bool) {
+        require(
+            value <= getReserveAddressesCollateralAssetBalance(collateralAsset),
+            "Exceeding the amount reserve holds"
+        );
+        // slither-disable-next-line reentrancy-events
+        IERC20(collateralAsset).safeTransfer(to, value);
+        emit ReserveCollateralAssetsTransferred(
+            msg.sender,
+            to,
+            value,
+            collateralAsset
+        );
+        return true;
+    }
+
+    /**
+     * @notice Transfer collateral asset to any address.
+     * @dev Transfers are not subject to a daily spending limit.
+     * @param collateralAsset The address of collateral asset being transferred.
+     * @param to The address that will receive the collateral asset.
+     * @param value The amount of collateral asset to transfer.
+     * @return Returns true if the transaction succeeds.
+     */
+    function transferExchangeCollateralAsset(
+        address collateralAsset,
+        address payable to,
+        uint256 value
+    ) external returns (bool) {
+        require(isExchangeSpender[msg.sender], "Address not allowed to spend");
+        return _transferCollateralAsset(collateralAsset, to, value);
+    }
+
+    /**
+     * @notice Transfer unfrozen gold to any address.
+     * @param to The address that will receive the gold.
+     * @param value The amount of gold to transfer.
+     * @return Returns true if the transaction succeeds.
+     */
+    function _transferGold(
+        address payable to,
+        uint256 value
+    ) internal returns (bool) {
+        require(value <= getUnfrozenBalance(), "Exceeding unfrozen reserves");
+        // slither-disable-next-line reentrancy-events
+        to.sendValue(value);
+        emit ReserveGoldTransferred(msg.sender, to, value);
+        return true;
+    }
+
+    /**
+     * @notice Transfer unfrozen gold to any address, used for one side of CP-DOTO.
+     * @dev Transfers are not subject to a daily spending limit.
+     * @param to The address that will receive the gold.
+     * @param value The amount of gold to transfer.
+     * @return Returns true if the transaction succeeds.
+     */
+    function transferExchangeGold(
+        address payable to,
+        uint256 value
+    ) external isAllowedToSpendExchange(msg.sender) returns (bool) {
+        return _transferGold(to, value);
+    }
+
+    /**
+     * @notice Returns the tobin tax, recomputing it if it's stale.
+     * @return The numerator - tobin tax amount as a fraction.
+     * @return The denominator - tobin tax amount as a fraction.
+     */
+    function getOrComputeTobinTax()
+        external
+        nonReentrant
+        returns (uint256, uint256)
+    {
+        // solhint-disable-next-line not-rely-on-time
+        if (now.sub(tobinTaxCache.timestamp) > tobinTaxStalenessThreshold) {
+            tobinTaxCache.numerator = uint128(computeTobinTax().unwrap());
+            tobinTaxCache.timestamp = uint128(now); // solhint-disable-line not-rely-on-time
+        }
+        return (
+            uint256(tobinTaxCache.numerator),
+            FixidityLib.fixed1().unwrap()
+        );
+    }
+
+    /**
+     * @notice Returns the list of stabilized token addresses.
+     * @return An array of addresses of stabilized tokens.
+     */
+    function getTokens() external view returns (address[] memory) {
+        return _tokens;
+    }
+
+    /**
+     * @notice Returns the list other addresses included in the reserve total.
+     * @return An array of other addresses included in the reserve total.
+     */
+    function getOtherReserveAddresses()
+        external
+        view
+        returns (address[] memory)
+    {
+        return otherReserveAddresses;
+    }
+
+    /**
+     * @notice Returns a list of token symbols that have been allocated.
+     * @return An array of token symbols that have been allocated.
+     */
+    function getAssetAllocationSymbols()
+        external
+        view
+        returns (bytes32[] memory)
+    {
+        return assetAllocationSymbols;
+    }
+
+    /**
+     * @notice Returns a list of weights used for the allocation of reserve assets.
+     * @return An array of a list of weights used for the allocation of reserve assets.
+     */
+    function getAssetAllocationWeights()
+        external
+        view
+        returns (uint256[] memory)
+    {
+        uint256[] memory weights = new uint256[](assetAllocationSymbols.length);
+        // slither-disable-next-line cache-array-length
+        for (uint256 i = 0; i < assetAllocationSymbols.length; i = i.add(1)) {
+            weights[i] = assetAllocationWeights[assetAllocationSymbols[i]];
+        }
+        return weights;
+    }
+
+    /**
+     * @notice Returns the amount of unfrozen CELO in the reserve.
+     * @return The total unfrozen CELO in the reserve.
+     */
+    function getUnfrozenBalance() public view returns (uint256) {
+        uint256 balance = address(this).balance;
+        uint256 frozenReserveGold = getFrozenReserveGoldBalance();
+        return balance > frozenReserveGold ? balance.sub(frozenReserveGold) : 0;
+    }
+
+    /**
+     * @notice Returns the amount of CELO included in the reserve.
+     * @return The CELO amount included in the reserve.
+     */
+    function getReserveGoldBalance() public view returns (uint256) {
+        return address(this).balance.add(getOtherReserveAddressesGoldBalance());
+    }
+
+    /**
+     * @notice Returns the amount of CELO included in other reserve addresses.
+     * @return The CELO amount included in other reserve addresses.
+     */
+    function getOtherReserveAddressesGoldBalance()
+        public
+        view
+        returns (uint256)
+    {
+        uint256 reserveGoldBalance = 0;
+        // slither-disable-next-line cache-array-length
+        for (uint256 i = 0; i < otherReserveAddresses.length; i = i.add(1)) {
+            reserveGoldBalance = reserveGoldBalance.add(
+                otherReserveAddresses[i].balance
+            );
+        }
+        return reserveGoldBalance;
+    }
+
+    /**
+     * @notice Returns the amount of unfrozen CELO included in the reserve.
+     * @return The unfrozen CELO amount included in the reserve.
+     */
+    function getUnfrozenReserveGoldBalance() public view returns (uint256) {
+        return getUnfrozenBalance().add(getOtherReserveAddressesGoldBalance());
+    }
+
+    /**
+     * @notice Returns the amount of particular collateral asset
+     * in reserve including other reserve addresses.
+     * @param collateralAsset the asset we're checking a balance of
+     * @return The balance of particular collateral asset.
+     */
+    function getReserveAddressesCollateralAssetBalance(
+        address collateralAsset
+    ) public view returns (uint256) {
+        require(
+            checkIsCollateralAsset(collateralAsset),
+            "specified address is not a collateral asset"
+        );
+        uint256 reserveCollateralAssetBalance = 0;
+        // slither-disable-next-line cache-array-length
+        for (uint256 i = 0; i < otherReserveAddresses.length; i++) {
+            // slither-disable-next-line calls-loop
+            reserveCollateralAssetBalance = reserveCollateralAssetBalance.add(
+                IERC20(collateralAsset).balanceOf(otherReserveAddresses[i])
+            );
+        }
+        return
+            reserveCollateralAssetBalance.add(
+                IERC20(collateralAsset).balanceOf(address(this))
+            );
+    }
+
+    /**
+     * @notice Add a collateral asset in the reserve.
+     * @param collateralAsset The address of the token being added.
+     * @return Returns true if the transaction succeeds.
+     */
+    function addCollateralAsset(
+        address collateralAsset
+    ) public onlyOwner returns (bool) {
+        require(
+            !checkIsCollateralAsset(collateralAsset),
+            "specified address is already added as a collateral asset"
+        );
+        require(collateralAsset != address(0), "can't be a zero address");
+        isCollateralAsset[collateralAsset] = true;
+        collateralAssets.push(collateralAsset);
+        emit CollateralAssetAdded(collateralAsset);
+        return true;
+    }
+
+    /**
+     * @notice Remove a collateral asset in the reserve.
+     * @param collateralAsset The address of the token being removed.
+     * @param index The index of the token being removed.
+     * @return Returns true if the transaction succeeds.
+     */
+    function removeCollateralAsset(
+        address collateralAsset,
+        uint256 index
+    ) external onlyOwner returns (bool) {
+        require(
+            checkIsCollateralAsset(collateralAsset),
+            "specified address is not a collateral asset"
+        );
+        require(
+            index < collateralAssets.length &&
+                collateralAssets[index] == collateralAsset,
+            "index into collateralAssets list not mapped to token"
+        );
+        collateralAssets[index] = collateralAssets[
+            collateralAssets.length.sub(1)
+        ];
+        collateralAssets.pop();
+        delete isCollateralAsset[collateralAsset];
+        emit CollateralAssetRemoved(collateralAsset);
+        return true;
+    }
+
+    /**
+     * @notice Check if a collateral asset is added to the reserve.
+     * @param collateralAsset The address of the token being checked.
+     * @return Returns true if the token was added as a collateral asset.
+     */
+    function checkIsCollateralAsset(
+        address collateralAsset
+    ) public view returns (bool) {
+        return isCollateralAsset[collateralAsset];
+    }
+
+    /**
+     * @notice Returns the amount of frozen CELO in the reserve.
+     * @return The total frozen CELO in the reserve.
+     */
+    function getFrozenReserveGoldBalance() public view returns (uint256) {
+        uint256 currentDay = now / 1 days;
+        uint256 frozenDays = currentDay.sub(frozenReserveGoldStartDay);
+        if (frozenDays >= frozenReserveGoldDays) return 0;
+        return
+            frozenReserveGoldStartBalance.sub(
+                frozenReserveGoldStartBalance.mul(frozenDays).div(
+                    frozenReserveGoldDays
+                )
+            );
+    }
+
+    /**
+     * @notice Computes the ratio of current reserve balance to total stable token valuation.
+     * @return Reserve ratio in a fixed point format.
+     */
+    function getReserveRatio() public view returns (uint256) {
+        address sortedOraclesAddress = registry.getAddressForOrDie(
+            SORTED_ORACLES_REGISTRY_ID
+        );
+        ISortedOracles sortedOracles = ISortedOracles(sortedOraclesAddress);
+        uint256 reserveGoldBalance = getUnfrozenReserveGoldBalance();
+        uint256 stableTokensValueInGold = 0;
+        FixidityLib.Fraction memory cgldWeight = FixidityLib.wrap(
+            assetAllocationWeights["cGLD"]
+        );
+
+        // slither-disable-next-line cache-array-length
+        for (uint256 i = 0; i < _tokens.length; i = i.add(1)) {
+            uint256 stableAmount;
+            uint256 goldAmount;
+            // slither-disable-next-line calls-loop
+            (stableAmount, goldAmount) = sortedOracles.medianRate(_tokens[i]);
+
+            if (goldAmount != 0) {
+                // tokens with no oracle reports don't count towards collateralization ratio
+                // slither-disable-next-line calls-loop
+                uint256 stableTokenSupply = IERC20(_tokens[i]).totalSupply();
+                uint256 aStableTokenValueInGold = stableTokenSupply
+                    .mul(goldAmount)
+                    .div(stableAmount);
+                stableTokensValueInGold = stableTokensValueInGold.add(
+                    aStableTokenValueInGold
+                );
+            }
+        }
+        return
+            FixidityLib
+                .newFixed(reserveGoldBalance)
+                .divide(cgldWeight)
+                .divide(FixidityLib.newFixed(stableTokensValueInGold))
+                .unwrap();
+    }
+
+    /*
+     * Internal functions
+     */
+
+    /**
+     * @notice Computes a tobin tax based on the reserve ratio.
+     * @return The tobin tax expresesed as a fixidity fraction.
+     */
+    function computeTobinTax()
+        private
+        view
+        returns (FixidityLib.Fraction memory)
+    {
+        FixidityLib.Fraction memory ratio = FixidityLib.wrap(getReserveRatio());
+        if (ratio.gte(FixidityLib.wrap(tobinTaxReserveRatio))) {
+            return FixidityLib.wrap(0);
+        } else {
+            return FixidityLib.wrap(tobinTax);
+        }
+    }
+
+    function isStableAsset(address token) external view returns (bool) {
+        return isToken[token];
+    }
 }
diff --git a/coverage_report/cmd_line b/coverage_report/cmd_line
index fc262d8..e348a86 100644
--- a/coverage_report/cmd_line
+++ b/coverage_report/cmd_line
@@ -1 +1 @@
-genhtml -o coverage_report lcov.info --ignore-errors corrupt --ignore-errors inconsistent
+genhtml -o coverage_report lcov.info --ignore-errors inconsistent
diff --git a/coverage_report/contracts/BancorExchangeProvider.sol.func-c.html b/coverage_report/contracts/BancorExchangeProvider.sol.func-c.html
index b5ca3fd..4ce4744 100644
--- a/coverage_report/contracts/BancorExchangeProvider.sol.func-c.html
+++ b/coverage_report/contracts/BancorExchangeProvider.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -107,77 +107,77 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L172">BancorExchangeProvider.getAmountIn</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L196">BancorExchangeProvider.currentPrice</a></td>
+              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L103">BancorExchangeProvider.getPoolExchange</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L398">BancorExchangeProvider.executeSwap</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L103">BancorExchangeProvider.getPoolExchange</a></td>
+              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L339">BancorExchangeProvider.swapIn</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L339">BancorExchangeProvider.swapIn</a></td>
+              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L367">BancorExchangeProvider.swapOut</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L367">BancorExchangeProvider.swapOut</a></td>
+              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L77">BancorExchangeProvider.onlyBroker</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">11</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L77">BancorExchangeProvider.onlyBroker</a></td>
+              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L146">BancorExchangeProvider.getAmountOut</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">13</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L424">BancorExchangeProvider._getAmountIn</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">14</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L146">BancorExchangeProvider.getAmountOut</a></td>
+              <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L196">BancorExchangeProvider.currentPrice</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">18</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L464">BancorExchangeProvider._getAmountOut</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">20</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L82">BancorExchangeProvider.verifyExchangeTokens</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">20</td>
               
               
             </tr>
@@ -191,28 +191,28 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L500">BancorExchangeProvider.validate</a></td>
               
-              <td class="coverFnHi">63</td>
+              <td class="coverFnHi">69</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L260">BancorExchangeProvider.createExchange</a></td>
               
-              <td class="coverFnHi">64</td>
+              <td class="coverFnHi">70</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L49">BancorExchangeProvider.</a></td>
               
-              <td class="coverFnHi">88</td>
+              <td class="coverFnHi">94</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L64">BancorExchangeProvider._initialize</a></td>
               
-              <td class="coverFnHi">88</td>
+              <td class="coverFnHi">94</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/BancorExchangeProvider.sol.func.html b/coverage_report/contracts/BancorExchangeProvider.sol.func.html
index 5597d0e..503e92a 100644
--- a/coverage_report/contracts/BancorExchangeProvider.sol.func.html
+++ b/coverage_report/contracts/BancorExchangeProvider.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -65,42 +65,42 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L49">BancorExchangeProvider.</a></td>
               
-              <td class="coverFnHi">88</td>
+              <td class="coverFnHi">94</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L424">BancorExchangeProvider._getAmountIn</a></td>
               
-              <td class="coverFnHi">10</td>
+              <td class="coverFnHi">14</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L464">BancorExchangeProvider._getAmountOut</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">20</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L64">BancorExchangeProvider._initialize</a></td>
               
-              <td class="coverFnHi">88</td>
+              <td class="coverFnHi">94</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L260">BancorExchangeProvider.createExchange</a></td>
               
-              <td class="coverFnHi">64</td>
+              <td class="coverFnHi">70</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L196">BancorExchangeProvider.currentPrice</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">18</td>
               
               
             </tr>
@@ -114,21 +114,21 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L398">BancorExchangeProvider.executeSwap</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L172">BancorExchangeProvider.getAmountIn</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L146">BancorExchangeProvider.getAmountOut</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">13</td>
               
               
             </tr>
@@ -149,7 +149,7 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L103">BancorExchangeProvider.getPoolExchange</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
@@ -163,7 +163,7 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L77">BancorExchangeProvider.onlyBroker</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">11</td>
               
               
             </tr>
@@ -191,28 +191,28 @@
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L339">BancorExchangeProvider.swapIn</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L367">BancorExchangeProvider.swapOut</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L500">BancorExchangeProvider.validate</a></td>
               
-              <td class="coverFnHi">63</td>
+              <td class="coverFnHi">69</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorExchangeProvider.sol.gcov.html#L82">BancorExchangeProvider.verifyExchangeTokens</a></td>
               
-              <td class="coverFnHi">16</td>
+              <td class="coverFnHi">20</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/BancorExchangeProvider.sol.gcov.html b/coverage_report/contracts/BancorExchangeProvider.sol.gcov.html
index 0673c2b..c4df836 100644
--- a/coverage_report/contracts/BancorExchangeProvider.sol.gcov.html
+++ b/coverage_report/contracts/BancorExchangeProvider.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -129,17 +129,17 @@
 <span id="L67"><span class="lineNum">      67</span>              :         address _broker,</span>
 <span id="L68"><span class="lineNum">      68</span>              :         address _reserve</span>
 <span id="L69"><span class="lineNum">      69</span>              :     ) internal onlyInitializing {</span>
-<span id="L70"><span class="lineNum">      70</span> <span class="tlaGNC">          88 :         __Ownable_init();</span></span>
+<span id="L70"><span class="lineNum">      70</span> <span class="tlaGNC">          94 :         __Ownable_init();</span></span>
 <span id="L71"><span class="lineNum">      71</span>              : </span>
-<span id="L72"><span class="lineNum">      72</span> <span class="tlaGNC">          88 :         BancorFormula.init();</span></span>
-<span id="L73"><span class="lineNum">      73</span> <span class="tlaGNC">          88 :         setBroker(_broker);</span></span>
-<span id="L74"><span class="lineNum">      74</span> <span class="tlaGNC">          88 :         setReserve(_reserve);</span></span>
+<span id="L72"><span class="lineNum">      72</span> <span class="tlaGNC">          94 :         BancorFormula.init();</span></span>
+<span id="L73"><span class="lineNum">      73</span> <span class="tlaGNC">          94 :         setBroker(_broker);</span></span>
+<span id="L74"><span class="lineNum">      74</span> <span class="tlaGNC">          94 :         setReserve(_reserve);</span></span>
 <span id="L75"><span class="lineNum">      75</span>              :     }</span>
 <span id="L76"><span class="lineNum">      76</span>              : </span>
 <span id="L77"><span class="lineNum">      77</span>              :     /* ==================== Modifiers ==================== */</span>
 <span id="L78"><span class="lineNum">      78</span>              : </span>
 <span id="L79"><span class="lineNum">      79</span>              :     modifier onlyBroker() {</span>
-<span id="L80"><span class="lineNum">      80</span> <span class="tlaGNC">           9 :         require(msg.sender == broker, &quot;Caller is not the Broker&quot;);</span></span>
+<span id="L80"><span class="lineNum">      80</span> <span class="tlaGNC">          11 :         require(msg.sender == broker, &quot;Caller is not the Broker&quot;);</span></span>
 <span id="L81"><span class="lineNum">      81</span>              :         _;</span>
 <span id="L82"><span class="lineNum">      82</span>              :     }</span>
 <span id="L83"><span class="lineNum">      83</span>              : </span>
@@ -148,7 +148,7 @@
 <span id="L86"><span class="lineNum">      86</span>              :         address tokenOut,</span>
 <span id="L87"><span class="lineNum">      87</span>              :         PoolExchange memory exchange</span>
 <span id="L88"><span class="lineNum">      88</span>              :     ) {</span>
-<span id="L89"><span class="lineNum">      89</span> <span class="tlaGNC">          16 :         require(</span></span>
+<span id="L89"><span class="lineNum">      89</span> <span class="tlaGNC">          20 :         require(</span></span>
 <span id="L90"><span class="lineNum">      90</span>              :             (tokenIn == exchange.reserveAsset &amp;&amp;</span>
 <span id="L91"><span class="lineNum">      91</span>              :                 tokenOut == exchange.tokenAddress) ||</span>
 <span id="L92"><span class="lineNum">      92</span>              :                 (tokenIn == exchange.tokenAddress &amp;&amp;</span>
@@ -167,8 +167,8 @@
 <span id="L105"><span class="lineNum">     105</span>              :     function getPoolExchange(</span>
 <span id="L106"><span class="lineNum">     106</span>              :         bytes32 exchangeId</span>
 <span id="L107"><span class="lineNum">     107</span>              :     ) public view returns (PoolExchange memory exchange) {</span>
-<span id="L108"><span class="lineNum">     108</span> <span class="tlaGNC">          63 :         exchange = exchanges[exchangeId];</span></span>
-<span id="L109"><span class="lineNum">     109</span> <span class="tlaGNC">          63 :         require(</span></span>
+<span id="L108"><span class="lineNum">     108</span> <span class="tlaGNC">          91 :         exchange = exchanges[exchangeId];</span></span>
+<span id="L109"><span class="lineNum">     109</span> <span class="tlaGNC">          91 :         require(</span></span>
 <span id="L110"><span class="lineNum">     110</span>              :             exchange.tokenAddress != address(0),</span>
 <span id="L111"><span class="lineNum">     111</span>              :             &quot;An exchange with the specified id does not exist&quot;</span>
 <span id="L112"><span class="lineNum">     112</span>              :         );</span>
@@ -213,16 +213,16 @@
 <span id="L151"><span class="lineNum">     151</span>              :         address tokenOut,</span>
 <span id="L152"><span class="lineNum">     152</span>              :         uint256 amountIn</span>
 <span id="L153"><span class="lineNum">     153</span>              :     ) external view virtual returns (uint256 amountOut) {</span>
-<span id="L154"><span class="lineNum">     154</span> <span class="tlaGNC">          11 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
-<span id="L155"><span class="lineNum">     155</span> <span class="tlaGNC">          10 :         uint256 scaledAmountIn = amountIn * tokenPrecisionMultipliers[tokenIn];</span></span>
-<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">          10 :         uint256 scaledAmountOut = _getAmountOut(</span></span>
+<span id="L154"><span class="lineNum">     154</span> <span class="tlaGNC">          13 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L155"><span class="lineNum">     155</span> <span class="tlaGNC">          12 :         uint256 scaledAmountIn = amountIn * tokenPrecisionMultipliers[tokenIn];</span></span>
+<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">          12 :         uint256 scaledAmountOut = _getAmountOut(</span></span>
 <span id="L157"><span class="lineNum">     157</span>              :             exchange,</span>
 <span id="L158"><span class="lineNum">     158</span>              :             tokenIn,</span>
 <span id="L159"><span class="lineNum">     159</span>              :             tokenOut,</span>
 <span id="L160"><span class="lineNum">     160</span>              :             scaledAmountIn</span>
 <span id="L161"><span class="lineNum">     161</span>              :         );</span>
-<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">           4 :         amountOut = scaledAmountOut / tokenPrecisionMultipliers[tokenOut];</span></span>
-<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">           4 :         return amountOut;</span></span>
+<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">           6 :         amountOut = scaledAmountOut / tokenPrecisionMultipliers[tokenOut];</span></span>
+<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">           6 :         return amountOut;</span></span>
 <span id="L164"><span class="lineNum">     164</span>              :     }</span>
 <span id="L165"><span class="lineNum">     165</span>              : </span>
 <span id="L166"><span class="lineNum">     166</span>              :     /**</span>
@@ -239,17 +239,17 @@
 <span id="L177"><span class="lineNum">     177</span>              :         address tokenOut,</span>
 <span id="L178"><span class="lineNum">     178</span>              :         uint256 amountOut</span>
 <span id="L179"><span class="lineNum">     179</span>              :     ) external view virtual returns (uint256 amountIn) {</span>
-<span id="L180"><span class="lineNum">     180</span> <span class="tlaGNC">           5 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
-<span id="L181"><span class="lineNum">     181</span> <span class="tlaGNC">           4 :         uint256 scaledAmountOut = amountOut *</span></span>
+<span id="L180"><span class="lineNum">     180</span> <span class="tlaGNC">           7 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L181"><span class="lineNum">     181</span> <span class="tlaGNC">           6 :         uint256 scaledAmountOut = amountOut *</span></span>
 <span id="L182"><span class="lineNum">     182</span>              :             tokenPrecisionMultipliers[tokenOut];</span>
-<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">           4 :         uint256 scaledAmountIn = _getAmountIn(</span></span>
+<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">           6 :         uint256 scaledAmountIn = _getAmountIn(</span></span>
 <span id="L184"><span class="lineNum">     184</span>              :             exchange,</span>
 <span id="L185"><span class="lineNum">     185</span>              :             tokenIn,</span>
 <span id="L186"><span class="lineNum">     186</span>              :             tokenOut,</span>
 <span id="L187"><span class="lineNum">     187</span>              :             scaledAmountOut</span>
 <span id="L188"><span class="lineNum">     188</span>              :         );</span>
-<span id="L189"><span class="lineNum">     189</span> <span class="tlaGNC">           4 :         amountIn = scaledAmountIn / tokenPrecisionMultipliers[tokenIn];</span></span>
-<span id="L190"><span class="lineNum">     190</span> <span class="tlaGNC">           4 :         return amountIn;</span></span>
+<span id="L189"><span class="lineNum">     189</span> <span class="tlaGNC">           6 :         amountIn = scaledAmountIn / tokenPrecisionMultipliers[tokenIn];</span></span>
+<span id="L190"><span class="lineNum">     190</span> <span class="tlaGNC">           6 :         return amountIn;</span></span>
 <span id="L191"><span class="lineNum">     191</span>              :     }</span>
 <span id="L192"><span class="lineNum">     192</span>              : </span>
 <span id="L193"><span class="lineNum">     193</span>              :     /**</span>
@@ -261,17 +261,17 @@
 <span id="L199"><span class="lineNum">     199</span>              :         bytes32 exchangeId</span>
 <span id="L200"><span class="lineNum">     200</span>              :     ) public view returns (uint256 price) {</span>
 <span id="L201"><span class="lineNum">     201</span>              :         // calculates: reserveBalance / (tokenSupply * reserveRatio)</span>
-<span id="L202"><span class="lineNum">     202</span> <span class="tlaGNC">           8 :         require(</span></span>
+<span id="L202"><span class="lineNum">     202</span> <span class="tlaGNC">          20 :         require(</span></span>
 <span id="L203"><span class="lineNum">     203</span>              :             exchanges[exchangeId].reserveAsset != address(0),</span>
 <span id="L204"><span class="lineNum">     204</span>              :             &quot;Exchange does not exist&quot;</span>
 <span id="L205"><span class="lineNum">     205</span>              :         );</span>
-<span id="L206"><span class="lineNum">     206</span> <span class="tlaGNC">           7 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
-<span id="L207"><span class="lineNum">     207</span> <span class="tlaGNC">           7 :         uint256 scaledReserveRatio = uint256(exchange.reserveRatio) * 1e10;</span></span>
-<span id="L208"><span class="lineNum">     208</span> <span class="tlaGNC">           7 :         UD60x18 denominator = wrap(exchange.tokenSupply).mul(</span></span>
+<span id="L206"><span class="lineNum">     206</span> <span class="tlaGNC">          19 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L207"><span class="lineNum">     207</span> <span class="tlaGNC">          19 :         uint256 scaledReserveRatio = uint256(exchange.reserveRatio) * 1e10;</span></span>
+<span id="L208"><span class="lineNum">     208</span> <span class="tlaGNC">          19 :         UD60x18 denominator = wrap(exchange.tokenSupply).mul(</span></span>
 <span id="L209"><span class="lineNum">     209</span>              :             wrap(scaledReserveRatio)</span>
 <span id="L210"><span class="lineNum">     210</span>              :         );</span>
-<span id="L211"><span class="lineNum">     211</span> <span class="tlaGNC">           7 :         price = unwrap(wrap(exchange.reserveBalance).div(denominator));</span></span>
-<span id="L212"><span class="lineNum">     212</span> <span class="tlaGNC">           7 :         return price;</span></span>
+<span id="L211"><span class="lineNum">     211</span> <span class="tlaGNC">          19 :         price = unwrap(wrap(exchange.reserveBalance).div(denominator));</span></span>
+<span id="L212"><span class="lineNum">     212</span> <span class="tlaGNC">          19 :         return price;</span></span>
 <span id="L213"><span class="lineNum">     213</span>              :     }</span>
 <span id="L214"><span class="lineNum">     214</span>              : </span>
 <span id="L215"><span class="lineNum">     215</span>              :     /* ==================== Mutative Functions ==================== */</span>
@@ -281,9 +281,9 @@
 <span id="L219"><span class="lineNum">     219</span>              :      * @param _broker The new address of the broker contract.</span>
 <span id="L220"><span class="lineNum">     220</span>              :      */</span>
 <span id="L221"><span class="lineNum">     221</span>              :     function setBroker(address _broker) public onlyOwner {</span>
-<span id="L222"><span class="lineNum">     222</span> <span class="tlaGNC">          90 :         require(_broker != address(0), &quot;Broker address must be set&quot;);</span></span>
-<span id="L223"><span class="lineNum">     223</span> <span class="tlaGNC">          89 :         broker = _broker;</span></span>
-<span id="L224"><span class="lineNum">     224</span> <span class="tlaGNC">          89 :         emit BrokerUpdated(_broker);</span></span>
+<span id="L222"><span class="lineNum">     222</span> <span class="tlaGNC">          96 :         require(_broker != address(0), &quot;Broker address must be set&quot;);</span></span>
+<span id="L223"><span class="lineNum">     223</span> <span class="tlaGNC">          95 :         broker = _broker;</span></span>
+<span id="L224"><span class="lineNum">     224</span> <span class="tlaGNC">          95 :         emit BrokerUpdated(_broker);</span></span>
 <span id="L225"><span class="lineNum">     225</span>              :     }</span>
 <span id="L226"><span class="lineNum">     226</span>              : </span>
 <span id="L227"><span class="lineNum">     227</span>              :     /**</span>
@@ -291,9 +291,9 @@
 <span id="L229"><span class="lineNum">     229</span>              :      * @param _reserve The new address of the reserve contract.</span>
 <span id="L230"><span class="lineNum">     230</span>              :      */</span>
 <span id="L231"><span class="lineNum">     231</span>              :     function setReserve(address _reserve) public onlyOwner {</span>
-<span id="L232"><span class="lineNum">     232</span> <span class="tlaGNC">          90 :         require(address(_reserve) != address(0), &quot;Reserve address must be set&quot;);</span></span>
-<span id="L233"><span class="lineNum">     233</span> <span class="tlaGNC">          89 :         reserve = IReserve(_reserve);</span></span>
-<span id="L234"><span class="lineNum">     234</span> <span class="tlaGNC">          89 :         emit ReserveUpdated(address(_reserve));</span></span>
+<span id="L232"><span class="lineNum">     232</span> <span class="tlaGNC">          96 :         require(address(_reserve) != address(0), &quot;Reserve address must be set&quot;);</span></span>
+<span id="L233"><span class="lineNum">     233</span> <span class="tlaGNC">          95 :         reserve = IReserve(_reserve);</span></span>
+<span id="L234"><span class="lineNum">     234</span> <span class="tlaGNC">          95 :         emit ReserveUpdated(address(_reserve));</span></span>
 <span id="L235"><span class="lineNum">     235</span>              :     }</span>
 <span id="L236"><span class="lineNum">     236</span>              : </span>
 <span id="L237"><span class="lineNum">     237</span>              :     /**</span>
@@ -324,36 +324,36 @@
 <span id="L262"><span class="lineNum">     262</span>              :     function createExchange(</span>
 <span id="L263"><span class="lineNum">     263</span>              :         PoolExchange calldata _exchange</span>
 <span id="L264"><span class="lineNum">     264</span>              :     ) external onlyOwner returns (bytes32 exchangeId) {</span>
-<span id="L265"><span class="lineNum">     265</span> <span class="tlaGNC">          63 :         PoolExchange memory exchange = _exchange;</span></span>
-<span id="L266"><span class="lineNum">     266</span> <span class="tlaGNC">          63 :         validate(exchange);</span></span>
+<span id="L265"><span class="lineNum">     265</span> <span class="tlaGNC">          69 :         PoolExchange memory exchange = _exchange;</span></span>
+<span id="L266"><span class="lineNum">     266</span> <span class="tlaGNC">          69 :         validate(exchange);</span></span>
 <span id="L267"><span class="lineNum">     267</span>              : </span>
-<span id="L268"><span class="lineNum">     268</span> <span class="tlaGNC">          55 :         exchangeId = keccak256(</span></span>
+<span id="L268"><span class="lineNum">     268</span> <span class="tlaGNC">          61 :         exchangeId = keccak256(</span></span>
 <span id="L269"><span class="lineNum">     269</span>              :             abi.encodePacked(</span>
 <span id="L270"><span class="lineNum">     270</span>              :                 IERC20(exchange.reserveAsset).symbol(),</span>
 <span id="L271"><span class="lineNum">     271</span>              :                 IERC20(exchange.tokenAddress).symbol()</span>
 <span id="L272"><span class="lineNum">     272</span>              :             )</span>
 <span id="L273"><span class="lineNum">     273</span>              :         );</span>
-<span id="L274"><span class="lineNum">     274</span> <span class="tlaGNC">          55 :         require(</span></span>
+<span id="L274"><span class="lineNum">     274</span> <span class="tlaGNC">          61 :         require(</span></span>
 <span id="L275"><span class="lineNum">     275</span>              :             exchanges[exchangeId].reserveAsset == address(0),</span>
 <span id="L276"><span class="lineNum">     276</span>              :             &quot;Exchange already exists&quot;</span>
 <span id="L277"><span class="lineNum">     277</span>              :         );</span>
 <span id="L278"><span class="lineNum">     278</span>              : </span>
-<span id="L279"><span class="lineNum">     279</span> <span class="tlaGNC">          54 :         uint256 reserveAssetDecimals = IERC20(exchange.reserveAsset).decimals();</span></span>
-<span id="L280"><span class="lineNum">     280</span> <span class="tlaGNC">          54 :         uint256 tokenDecimals = IERC20(exchange.tokenAddress).decimals();</span></span>
-<span id="L281"><span class="lineNum">     281</span> <span class="tlaGNC">          54 :         require(</span></span>
+<span id="L279"><span class="lineNum">     279</span> <span class="tlaGNC">          60 :         uint256 reserveAssetDecimals = IERC20(exchange.reserveAsset).decimals();</span></span>
+<span id="L280"><span class="lineNum">     280</span> <span class="tlaGNC">          60 :         uint256 tokenDecimals = IERC20(exchange.tokenAddress).decimals();</span></span>
+<span id="L281"><span class="lineNum">     281</span> <span class="tlaGNC">          60 :         require(</span></span>
 <span id="L282"><span class="lineNum">     282</span>              :             reserveAssetDecimals &lt;= 18,</span>
 <span id="L283"><span class="lineNum">     283</span>              :             &quot;reserve token decimals must be &lt;= 18&quot;</span>
 <span id="L284"><span class="lineNum">     284</span>              :         );</span>
-<span id="L285"><span class="lineNum">     285</span> <span class="tlaGNC">          53 :         require(tokenDecimals &lt;= 18, &quot;token decimals must be &lt;= 18&quot;);</span></span>
+<span id="L285"><span class="lineNum">     285</span> <span class="tlaGNC">          59 :         require(tokenDecimals &lt;= 18, &quot;token decimals must be &lt;= 18&quot;);</span></span>
 <span id="L286"><span class="lineNum">     286</span>              : </span>
-<span id="L287"><span class="lineNum">     287</span> <span class="tlaGNC">          52 :         tokenPrecisionMultipliers[exchange.reserveAsset] =</span></span>
+<span id="L287"><span class="lineNum">     287</span> <span class="tlaGNC">          58 :         tokenPrecisionMultipliers[exchange.reserveAsset] =</span></span>
 <span id="L288"><span class="lineNum">     288</span>              :             10 ** (18 - uint256(reserveAssetDecimals));</span>
-<span id="L289"><span class="lineNum">     289</span> <span class="tlaGNC">          52 :         tokenPrecisionMultipliers[exchange.tokenAddress] =</span></span>
+<span id="L289"><span class="lineNum">     289</span> <span class="tlaGNC">          58 :         tokenPrecisionMultipliers[exchange.tokenAddress] =</span></span>
 <span id="L290"><span class="lineNum">     290</span>              :             10 ** (18 - uint256(tokenDecimals));</span>
 <span id="L291"><span class="lineNum">     291</span>              : </span>
-<span id="L292"><span class="lineNum">     292</span> <span class="tlaGNC">          52 :         exchanges[exchangeId] = exchange;</span></span>
-<span id="L293"><span class="lineNum">     293</span> <span class="tlaGNC">          52 :         exchangeIds.push(exchangeId);</span></span>
-<span id="L294"><span class="lineNum">     294</span> <span class="tlaGNC">          52 :         emit ExchangeCreated(</span></span>
+<span id="L292"><span class="lineNum">     292</span> <span class="tlaGNC">          58 :         exchanges[exchangeId] = exchange;</span></span>
+<span id="L293"><span class="lineNum">     293</span> <span class="tlaGNC">          58 :         exchangeIds.push(exchangeId);</span></span>
+<span id="L294"><span class="lineNum">     294</span> <span class="tlaGNC">          58 :         emit ExchangeCreated(</span></span>
 <span id="L295"><span class="lineNum">     295</span>              :             exchangeId,</span>
 <span id="L296"><span class="lineNum">     296</span>              :             exchange.reserveAsset,</span>
 <span id="L297"><span class="lineNum">     297</span>              :             exchange.tokenAddress</span>
@@ -406,18 +406,18 @@
 <span id="L344"><span class="lineNum">     344</span>              :         address tokenOut,</span>
 <span id="L345"><span class="lineNum">     345</span>              :         uint256 amountIn</span>
 <span id="L346"><span class="lineNum">     346</span>              :     ) public virtual onlyBroker returns (uint256 amountOut) {</span>
-<span id="L347"><span class="lineNum">     347</span> <span class="tlaGNC">           7 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
-<span id="L348"><span class="lineNum">     348</span> <span class="tlaGNC">           6 :         uint256 scaledAmountIn = amountIn * tokenPrecisionMultipliers[tokenIn];</span></span>
-<span id="L349"><span class="lineNum">     349</span> <span class="tlaGNC">           6 :         uint256 scaledAmountOut = _getAmountOut(</span></span>
+<span id="L347"><span class="lineNum">     347</span> <span class="tlaGNC">           9 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L348"><span class="lineNum">     348</span> <span class="tlaGNC">           8 :         uint256 scaledAmountIn = amountIn * tokenPrecisionMultipliers[tokenIn];</span></span>
+<span id="L349"><span class="lineNum">     349</span> <span class="tlaGNC">           8 :         uint256 scaledAmountOut = _getAmountOut(</span></span>
 <span id="L350"><span class="lineNum">     350</span>              :             exchange,</span>
 <span id="L351"><span class="lineNum">     351</span>              :             tokenIn,</span>
 <span id="L352"><span class="lineNum">     352</span>              :             tokenOut,</span>
 <span id="L353"><span class="lineNum">     353</span>              :             scaledAmountIn</span>
 <span id="L354"><span class="lineNum">     354</span>              :         );</span>
-<span id="L355"><span class="lineNum">     355</span> <span class="tlaGNC">           3 :         executeSwap(exchangeId, tokenIn, scaledAmountIn, scaledAmountOut);</span></span>
+<span id="L355"><span class="lineNum">     355</span> <span class="tlaGNC">           5 :         executeSwap(exchangeId, tokenIn, scaledAmountIn, scaledAmountOut);</span></span>
 <span id="L356"><span class="lineNum">     356</span>              : </span>
-<span id="L357"><span class="lineNum">     357</span> <span class="tlaGNC">           3 :         amountOut = scaledAmountOut / tokenPrecisionMultipliers[tokenOut];</span></span>
-<span id="L358"><span class="lineNum">     358</span> <span class="tlaGNC">           3 :         return amountOut;</span></span>
+<span id="L357"><span class="lineNum">     357</span> <span class="tlaGNC">           5 :         amountOut = scaledAmountOut / tokenPrecisionMultipliers[tokenOut];</span></span>
+<span id="L358"><span class="lineNum">     358</span> <span class="tlaGNC">           5 :         return amountOut;</span></span>
 <span id="L359"><span class="lineNum">     359</span>              :     }</span>
 <span id="L360"><span class="lineNum">     360</span>              : </span>
 <span id="L361"><span class="lineNum">     361</span>              :     /**</span>
@@ -434,19 +434,19 @@
 <span id="L372"><span class="lineNum">     372</span>              :         address tokenOut,</span>
 <span id="L373"><span class="lineNum">     373</span>              :         uint256 amountOut</span>
 <span id="L374"><span class="lineNum">     374</span>              :     ) public virtual onlyBroker returns (uint256 amountIn) {</span>
-<span id="L375"><span class="lineNum">     375</span> <span class="tlaGNC">           7 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
-<span id="L376"><span class="lineNum">     376</span> <span class="tlaGNC">           6 :         uint256 scaledAmountOut = amountOut *</span></span>
+<span id="L375"><span class="lineNum">     375</span> <span class="tlaGNC">           9 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L376"><span class="lineNum">     376</span> <span class="tlaGNC">           8 :         uint256 scaledAmountOut = amountOut *</span></span>
 <span id="L377"><span class="lineNum">     377</span>              :             tokenPrecisionMultipliers[tokenOut];</span>
-<span id="L378"><span class="lineNum">     378</span> <span class="tlaGNC">           6 :         uint256 scaledAmountIn = _getAmountIn(</span></span>
+<span id="L378"><span class="lineNum">     378</span> <span class="tlaGNC">           8 :         uint256 scaledAmountIn = _getAmountIn(</span></span>
 <span id="L379"><span class="lineNum">     379</span>              :             exchange,</span>
 <span id="L380"><span class="lineNum">     380</span>              :             tokenIn,</span>
 <span id="L381"><span class="lineNum">     381</span>              :             tokenOut,</span>
 <span id="L382"><span class="lineNum">     382</span>              :             scaledAmountOut</span>
 <span id="L383"><span class="lineNum">     383</span>              :         );</span>
-<span id="L384"><span class="lineNum">     384</span> <span class="tlaGNC">           3 :         executeSwap(exchangeId, tokenIn, scaledAmountIn, scaledAmountOut);</span></span>
+<span id="L384"><span class="lineNum">     384</span> <span class="tlaGNC">           5 :         executeSwap(exchangeId, tokenIn, scaledAmountIn, scaledAmountOut);</span></span>
 <span id="L385"><span class="lineNum">     385</span>              : </span>
-<span id="L386"><span class="lineNum">     386</span> <span class="tlaGNC">           3 :         amountIn = scaledAmountIn / tokenPrecisionMultipliers[tokenIn];</span></span>
-<span id="L387"><span class="lineNum">     387</span> <span class="tlaGNC">           3 :         return amountIn;</span></span>
+<span id="L386"><span class="lineNum">     386</span> <span class="tlaGNC">           5 :         amountIn = scaledAmountIn / tokenPrecisionMultipliers[tokenIn];</span></span>
+<span id="L387"><span class="lineNum">     387</span> <span class="tlaGNC">           5 :         return amountIn;</span></span>
 <span id="L388"><span class="lineNum">     388</span>              :     }</span>
 <span id="L389"><span class="lineNum">     389</span>              : </span>
 <span id="L390"><span class="lineNum">     390</span>              :     /* ==================== Private Functions ==================== */</span>
@@ -465,16 +465,16 @@
 <span id="L403"><span class="lineNum">     403</span>              :         uint256 scaledAmountIn,</span>
 <span id="L404"><span class="lineNum">     404</span>              :         uint256 scaledAmountOut</span>
 <span id="L405"><span class="lineNum">     405</span>              :     ) internal {</span>
-<span id="L406"><span class="lineNum">     406</span> <span class="tlaGNC">           6 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
-<span id="L407"><span class="lineNum">     407</span> <span class="tlaGNC">           6 :         if (tokenIn == exchange.reserveAsset) {</span></span>
-<span id="L408"><span class="lineNum">     408</span> <span class="tlaGNC">           4 :             exchange.reserveBalance += scaledAmountIn;</span></span>
-<span id="L409"><span class="lineNum">     409</span> <span class="tlaGNC">           4 :             exchange.tokenSupply += scaledAmountOut;</span></span>
+<span id="L406"><span class="lineNum">     406</span> <span class="tlaGNC">          10 :         PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L407"><span class="lineNum">     407</span> <span class="tlaGNC">          10 :         if (tokenIn == exchange.reserveAsset) {</span></span>
+<span id="L408"><span class="lineNum">     408</span> <span class="tlaGNC">           6 :             exchange.reserveBalance += scaledAmountIn;</span></span>
+<span id="L409"><span class="lineNum">     409</span> <span class="tlaGNC">           6 :             exchange.tokenSupply += scaledAmountOut;</span></span>
 <span id="L410"><span class="lineNum">     410</span>              :         } else {</span>
-<span id="L411"><span class="lineNum">     411</span> <span class="tlaGNC">           2 :             exchange.reserveBalance -= scaledAmountOut;</span></span>
-<span id="L412"><span class="lineNum">     412</span> <span class="tlaGNC">           2 :             exchange.tokenSupply -= scaledAmountIn;</span></span>
+<span id="L411"><span class="lineNum">     411</span> <span class="tlaGNC">           4 :             exchange.reserveBalance -= scaledAmountOut;</span></span>
+<span id="L412"><span class="lineNum">     412</span> <span class="tlaGNC">           4 :             exchange.tokenSupply -= scaledAmountIn;</span></span>
 <span id="L413"><span class="lineNum">     413</span>              :         }</span>
-<span id="L414"><span class="lineNum">     414</span> <span class="tlaGNC">           6 :         exchanges[exchangeId].reserveBalance = exchange.reserveBalance;</span></span>
-<span id="L415"><span class="lineNum">     415</span> <span class="tlaGNC">           6 :         exchanges[exchangeId].tokenSupply = exchange.tokenSupply;</span></span>
+<span id="L414"><span class="lineNum">     414</span> <span class="tlaGNC">          10 :         exchanges[exchangeId].reserveBalance = exchange.reserveBalance;</span></span>
+<span id="L415"><span class="lineNum">     415</span> <span class="tlaGNC">          10 :         exchanges[exchangeId].tokenSupply = exchange.tokenSupply;</span></span>
 <span id="L416"><span class="lineNum">     416</span>              :     }</span>
 <span id="L417"><span class="lineNum">     417</span>              : </span>
 <span id="L418"><span class="lineNum">     418</span>              :     /**</span>
@@ -496,22 +496,22 @@
 <span id="L434"><span class="lineNum">     434</span>              :         verifyExchangeTokens(tokenIn, tokenOut, exchange)</span>
 <span id="L435"><span class="lineNum">     435</span>              :         returns (uint256 scaledAmountIn)</span>
 <span id="L436"><span class="lineNum">     436</span>              :     {</span>
-<span id="L437"><span class="lineNum">     437</span> <span class="tlaGNC">           7 :         if (tokenIn == exchange.reserveAsset) {</span></span>
-<span id="L438"><span class="lineNum">     438</span> <span class="tlaGNC">           4 :             scaledAmountIn = fundCost(</span></span>
+<span id="L437"><span class="lineNum">     437</span> <span class="tlaGNC">          11 :         if (tokenIn == exchange.reserveAsset) {</span></span>
+<span id="L438"><span class="lineNum">     438</span> <span class="tlaGNC">           6 :             scaledAmountIn = fundCost(</span></span>
 <span id="L439"><span class="lineNum">     439</span>              :                 exchange.tokenSupply,</span>
 <span id="L440"><span class="lineNum">     440</span>              :                 exchange.reserveBalance,</span>
 <span id="L441"><span class="lineNum">     441</span>              :                 exchange.reserveRatio,</span>
 <span id="L442"><span class="lineNum">     442</span>              :                 scaledAmountOut</span>
 <span id="L443"><span class="lineNum">     443</span>              :             );</span>
 <span id="L444"><span class="lineNum">     444</span>              :         } else {</span>
-<span id="L445"><span class="lineNum">     445</span> <span class="tlaGNC">           3 :             scaledAmountIn = fundSupplyAmount(</span></span>
+<span id="L445"><span class="lineNum">     445</span> <span class="tlaGNC">           5 :             scaledAmountIn = fundSupplyAmount(</span></span>
 <span id="L446"><span class="lineNum">     446</span>              :                 exchange.tokenSupply,</span>
 <span id="L447"><span class="lineNum">     447</span>              :                 exchange.reserveBalance,</span>
 <span id="L448"><span class="lineNum">     448</span>              :                 exchange.reserveRatio,</span>
 <span id="L449"><span class="lineNum">     449</span>              :                 scaledAmountOut</span>
 <span id="L450"><span class="lineNum">     450</span>              :             );</span>
 <span id="L451"><span class="lineNum">     451</span>              : </span>
-<span id="L452"><span class="lineNum">     452</span> <span class="tlaGNC">           3 :             scaledAmountIn =</span></span>
+<span id="L452"><span class="lineNum">     452</span> <span class="tlaGNC">           5 :             scaledAmountIn =</span></span>
 <span id="L453"><span class="lineNum">     453</span>              :                 (scaledAmountIn * MAX_WEIGHT) /</span>
 <span id="L454"><span class="lineNum">     454</span>              :                 (MAX_WEIGHT - exchange.exitContribution);</span>
 <span id="L455"><span class="lineNum">     455</span>              :         }</span>
@@ -536,18 +536,18 @@
 <span id="L474"><span class="lineNum">     474</span>              :         verifyExchangeTokens(tokenIn, tokenOut, exchange)</span>
 <span id="L475"><span class="lineNum">     475</span>              :         returns (uint256 scaledAmountOut)</span>
 <span id="L476"><span class="lineNum">     476</span>              :     {</span>
-<span id="L477"><span class="lineNum">     477</span> <span class="tlaGNC">           7 :         if (tokenIn == exchange.reserveAsset) {</span></span>
-<span id="L478"><span class="lineNum">     478</span> <span class="tlaGNC">           4 :             scaledAmountOut = purchaseTargetAmount(</span></span>
+<span id="L477"><span class="lineNum">     477</span> <span class="tlaGNC">          11 :         if (tokenIn == exchange.reserveAsset) {</span></span>
+<span id="L478"><span class="lineNum">     478</span> <span class="tlaGNC">           6 :             scaledAmountOut = purchaseTargetAmount(</span></span>
 <span id="L479"><span class="lineNum">     479</span>              :                 exchange.tokenSupply,</span>
 <span id="L480"><span class="lineNum">     480</span>              :                 exchange.reserveBalance,</span>
 <span id="L481"><span class="lineNum">     481</span>              :                 exchange.reserveRatio,</span>
 <span id="L482"><span class="lineNum">     482</span>              :                 scaledAmountIn</span>
 <span id="L483"><span class="lineNum">     483</span>              :             );</span>
 <span id="L484"><span class="lineNum">     484</span>              :         } else {</span>
-<span id="L485"><span class="lineNum">     485</span> <span class="tlaGNC">           3 :             scaledAmountIn =</span></span>
+<span id="L485"><span class="lineNum">     485</span> <span class="tlaGNC">           5 :             scaledAmountIn =</span></span>
 <span id="L486"><span class="lineNum">     486</span>              :                 (scaledAmountIn * (MAX_WEIGHT - exchange.exitContribution)) /</span>
 <span id="L487"><span class="lineNum">     487</span>              :                 MAX_WEIGHT;</span>
-<span id="L488"><span class="lineNum">     488</span> <span class="tlaGNC">           3 :             scaledAmountOut = saleTargetAmount(</span></span>
+<span id="L488"><span class="lineNum">     488</span> <span class="tlaGNC">           5 :             scaledAmountOut = saleTargetAmount(</span></span>
 <span id="L489"><span class="lineNum">     489</span>              :                 exchange.tokenSupply,</span>
 <span id="L490"><span class="lineNum">     490</span>              :                 exchange.reserveBalance,</span>
 <span id="L491"><span class="lineNum">     491</span>              :                 exchange.reserveRatio,</span>
@@ -562,19 +562,19 @@
 <span id="L500"><span class="lineNum">     500</span>              :      * @param exchange The PoolExchange to validate</span>
 <span id="L501"><span class="lineNum">     501</span>              :      */</span>
 <span id="L502"><span class="lineNum">     502</span>              :     function validate(PoolExchange memory exchange) private view {</span>
-<span id="L503"><span class="lineNum">     503</span> <span class="tlaGNC">          63 :         require(exchange.reserveAsset != address(0), &quot;Invalid reserve asset&quot;);</span></span>
-<span id="L504"><span class="lineNum">     504</span> <span class="tlaGNC">          62 :         require(</span></span>
+<span id="L503"><span class="lineNum">     503</span> <span class="tlaGNC">          69 :         require(exchange.reserveAsset != address(0), &quot;Invalid reserve asset&quot;);</span></span>
+<span id="L504"><span class="lineNum">     504</span> <span class="tlaGNC">          68 :         require(</span></span>
 <span id="L505"><span class="lineNum">     505</span>              :             reserve.isCollateralAsset(exchange.reserveAsset),</span>
 <span id="L506"><span class="lineNum">     506</span>              :             &quot;reserve asset must be a collateral registered with the reserve&quot;</span>
 <span id="L507"><span class="lineNum">     507</span>              :         );</span>
-<span id="L508"><span class="lineNum">     508</span> <span class="tlaGNC">          61 :         require(exchange.tokenAddress != address(0), &quot;Invalid token address&quot;);</span></span>
-<span id="L509"><span class="lineNum">     509</span> <span class="tlaGNC">          60 :         require(</span></span>
+<span id="L508"><span class="lineNum">     508</span> <span class="tlaGNC">          67 :         require(exchange.tokenAddress != address(0), &quot;Invalid token address&quot;);</span></span>
+<span id="L509"><span class="lineNum">     509</span> <span class="tlaGNC">          66 :         require(</span></span>
 <span id="L510"><span class="lineNum">     510</span>              :             reserve.isStableAsset(exchange.tokenAddress),</span>
 <span id="L511"><span class="lineNum">     511</span>              :             &quot;token must be a stable registered with the reserve&quot;</span>
 <span id="L512"><span class="lineNum">     512</span>              :         );</span>
-<span id="L513"><span class="lineNum">     513</span> <span class="tlaGNC">          59 :         require(exchange.reserveRatio &gt; 1, &quot;Invalid reserve ratio&quot;);</span></span>
-<span id="L514"><span class="lineNum">     514</span> <span class="tlaGNC">          57 :         require(exchange.reserveRatio &lt;= MAX_WEIGHT, &quot;Invalid reserve ratio&quot;);</span></span>
-<span id="L515"><span class="lineNum">     515</span> <span class="tlaGNC">          56 :         require(</span></span>
+<span id="L513"><span class="lineNum">     513</span> <span class="tlaGNC">          65 :         require(exchange.reserveRatio &gt; 1, &quot;Invalid reserve ratio&quot;);</span></span>
+<span id="L514"><span class="lineNum">     514</span> <span class="tlaGNC">          63 :         require(exchange.reserveRatio &lt;= MAX_WEIGHT, &quot;Invalid reserve ratio&quot;);</span></span>
+<span id="L515"><span class="lineNum">     515</span> <span class="tlaGNC">          62 :         require(</span></span>
 <span id="L516"><span class="lineNum">     516</span>              :             exchange.exitContribution &lt;= MAX_WEIGHT,</span>
 <span id="L517"><span class="lineNum">     517</span>              :             &quot;Invalid exit contribution&quot;</span>
 <span id="L518"><span class="lineNum">     518</span>              :         );</span>
diff --git a/coverage_report/contracts/BancorFormula.sol.func-c.html b/coverage_report/contracts/BancorFormula.sol.func-c.html
index 782e431..687c859 100644
--- a/coverage_report/contracts/BancorFormula.sol.func-c.html
+++ b/coverage_report/contracts/BancorFormula.sol.func-c.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryLo">65.3&nbsp;%</td>
+            <td class="headerCovTableEntryLo">65.8&nbsp;%</td>
             <td class="headerCovTableEntry">357</td>
-            <td class="headerCovTableEntry">233</td>
+            <td class="headerCovTableEntry">235</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">61.5&nbsp;%</td>
@@ -100,56 +100,56 @@
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L311">BancorFormula.fundSupplyAmount</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L228">BancorFormula.saleTargetAmount</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L272">BancorFormula.fundCost</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L189">BancorFormula.purchaseTargetAmount</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L610">BancorFormula.optimalExp</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">22</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L538">BancorFormula.optimalLog</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">22</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L354">BancorFormula.power</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">22</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L37">BancorFormula.initMaxExpArray</a></td>
               
-              <td class="coverFnHi">88</td>
+              <td class="coverFnHi">94</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/BancorFormula.sol.func.html b/coverage_report/contracts/BancorFormula.sol.func.html
index 48b8d4c..795de4a 100644
--- a/coverage_report/contracts/BancorFormula.sol.func.html
+++ b/coverage_report/contracts/BancorFormula.sol.func.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryLo">65.3&nbsp;%</td>
+            <td class="headerCovTableEntryLo">65.8&nbsp;%</td>
             <td class="headerCovTableEntry">357</td>
-            <td class="headerCovTableEntry">233</td>
+            <td class="headerCovTableEntry">235</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">61.5&nbsp;%</td>
@@ -79,14 +79,14 @@
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L272">BancorFormula.fundCost</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L311">BancorFormula.fundSupplyAmount</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
@@ -114,42 +114,42 @@
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L37">BancorFormula.initMaxExpArray</a></td>
               
-              <td class="coverFnHi">88</td>
+              <td class="coverFnHi">94</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L610">BancorFormula.optimalExp</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">22</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L538">BancorFormula.optimalLog</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">22</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L354">BancorFormula.power</a></td>
               
-              <td class="coverFnHi">14</td>
+              <td class="coverFnHi">22</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L189">BancorFormula.purchaseTargetAmount</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="BancorFormula.sol.gcov.html#L228">BancorFormula.saleTargetAmount</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/BancorFormula.sol.gcov.html b/coverage_report/contracts/BancorFormula.sol.gcov.html
index ee7354a..5e5239f 100644
--- a/coverage_report/contracts/BancorFormula.sol.gcov.html
+++ b/coverage_report/contracts/BancorFormula.sol.gcov.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryLo">65.3&nbsp;%</td>
+            <td class="headerCovTableEntryLo">65.8&nbsp;%</td>
             <td class="headerCovTableEntry">357</td>
-            <td class="headerCovTableEntry">233</td>
+            <td class="headerCovTableEntry">235</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">61.5&nbsp;%</td>
@@ -131,109 +131,109 @@
 <span id="L69"><span class="lineNum">      69</span>              :     //  maxExpArray[ 29] = 0x1fffffffffffffffffffffffffffffffff;</span>
 <span id="L70"><span class="lineNum">      70</span>              :     //  maxExpArray[ 30] = 0x1eaefdbdabffffffffffffffffffffffff;</span>
 <span id="L71"><span class="lineNum">      71</span>              :     //  maxExpArray[ 31] = 0x1d6bd8b2ebffffffffffffffffffffffff;</span>
-<span id="L72"><span class="lineNum">      72</span> <span class="tlaGNC tlaBgGNC">          88 :     maxExpArray[32] = 0x1c35fedd14ffffffffffffffffffffffff;</span></span>
-<span id="L73"><span class="lineNum">      73</span> <span class="tlaGNC">          88 :     maxExpArray[33] = 0x1b0ce43b323fffffffffffffffffffffff;</span></span>
-<span id="L74"><span class="lineNum">      74</span> <span class="tlaGNC">          88 :     maxExpArray[34] = 0x19f0028ec1ffffffffffffffffffffffff;</span></span>
-<span id="L75"><span class="lineNum">      75</span> <span class="tlaGNC">          88 :     maxExpArray[35] = 0x18ded91f0e7fffffffffffffffffffffff;</span></span>
-<span id="L76"><span class="lineNum">      76</span> <span class="tlaGNC">          88 :     maxExpArray[36] = 0x17d8ec7f0417ffffffffffffffffffffff;</span></span>
-<span id="L77"><span class="lineNum">      77</span> <span class="tlaGNC">          88 :     maxExpArray[37] = 0x16ddc6556cdbffffffffffffffffffffff;</span></span>
-<span id="L78"><span class="lineNum">      78</span> <span class="tlaGNC">          88 :     maxExpArray[38] = 0x15ecf52776a1ffffffffffffffffffffff;</span></span>
-<span id="L79"><span class="lineNum">      79</span> <span class="tlaGNC">          88 :     maxExpArray[39] = 0x15060c256cb2ffffffffffffffffffffff;</span></span>
-<span id="L80"><span class="lineNum">      80</span> <span class="tlaGNC">          88 :     maxExpArray[40] = 0x1428a2f98d72ffffffffffffffffffffff;</span></span>
-<span id="L81"><span class="lineNum">      81</span> <span class="tlaGNC">          88 :     maxExpArray[41] = 0x13545598e5c23fffffffffffffffffffff;</span></span>
-<span id="L82"><span class="lineNum">      82</span> <span class="tlaGNC">          88 :     maxExpArray[42] = 0x1288c4161ce1dfffffffffffffffffffff;</span></span>
-<span id="L83"><span class="lineNum">      83</span> <span class="tlaGNC">          88 :     maxExpArray[43] = 0x11c592761c666fffffffffffffffffffff;</span></span>
-<span id="L84"><span class="lineNum">      84</span> <span class="tlaGNC">          88 :     maxExpArray[44] = 0x110a688680a757ffffffffffffffffffff;</span></span>
-<span id="L85"><span class="lineNum">      85</span> <span class="tlaGNC">          88 :     maxExpArray[45] = 0x1056f1b5bedf77ffffffffffffffffffff;</span></span>
-<span id="L86"><span class="lineNum">      86</span> <span class="tlaGNC">          88 :     maxExpArray[46] = 0x0faadceceeff8bffffffffffffffffffff;</span></span>
-<span id="L87"><span class="lineNum">      87</span> <span class="tlaGNC">          88 :     maxExpArray[47] = 0x0f05dc6b27edadffffffffffffffffffff;</span></span>
-<span id="L88"><span class="lineNum">      88</span> <span class="tlaGNC">          88 :     maxExpArray[48] = 0x0e67a5a25da4107fffffffffffffffffff;</span></span>
-<span id="L89"><span class="lineNum">      89</span> <span class="tlaGNC">          88 :     maxExpArray[49] = 0x0dcff115b14eedffffffffffffffffffff;</span></span>
-<span id="L90"><span class="lineNum">      90</span> <span class="tlaGNC">          88 :     maxExpArray[50] = 0x0d3e7a392431239fffffffffffffffffff;</span></span>
-<span id="L91"><span class="lineNum">      91</span> <span class="tlaGNC">          88 :     maxExpArray[51] = 0x0cb2ff529eb71e4fffffffffffffffffff;</span></span>
-<span id="L92"><span class="lineNum">      92</span> <span class="tlaGNC">          88 :     maxExpArray[52] = 0x0c2d415c3db974afffffffffffffffffff;</span></span>
-<span id="L93"><span class="lineNum">      93</span> <span class="tlaGNC">          88 :     maxExpArray[53] = 0x0bad03e7d883f69bffffffffffffffffff;</span></span>
-<span id="L94"><span class="lineNum">      94</span> <span class="tlaGNC">          88 :     maxExpArray[54] = 0x0b320d03b2c343d5ffffffffffffffffff;</span></span>
-<span id="L95"><span class="lineNum">      95</span> <span class="tlaGNC">          88 :     maxExpArray[55] = 0x0abc25204e02828dffffffffffffffffff;</span></span>
-<span id="L96"><span class="lineNum">      96</span> <span class="tlaGNC">          88 :     maxExpArray[56] = 0x0a4b16f74ee4bb207fffffffffffffffff;</span></span>
-<span id="L97"><span class="lineNum">      97</span> <span class="tlaGNC">          88 :     maxExpArray[57] = 0x09deaf736ac1f569ffffffffffffffffff;</span></span>
-<span id="L98"><span class="lineNum">      98</span> <span class="tlaGNC">          88 :     maxExpArray[58] = 0x0976bd9952c7aa957fffffffffffffffff;</span></span>
-<span id="L99"><span class="lineNum">      99</span> <span class="tlaGNC">          88 :     maxExpArray[59] = 0x09131271922eaa606fffffffffffffffff;</span></span>
-<span id="L100"><span class="lineNum">     100</span> <span class="tlaGNC">          88 :     maxExpArray[60] = 0x08b380f3558668c46fffffffffffffffff;</span></span>
-<span id="L101"><span class="lineNum">     101</span> <span class="tlaGNC">          88 :     maxExpArray[61] = 0x0857ddf0117efa215bffffffffffffffff;</span></span>
-<span id="L102"><span class="lineNum">     102</span> <span class="tlaGNC">          88 :     maxExpArray[62] = 0x07ffffffffffffffffffffffffffffffff;</span></span>
-<span id="L103"><span class="lineNum">     103</span> <span class="tlaGNC">          88 :     maxExpArray[63] = 0x07abbf6f6abb9d087fffffffffffffffff;</span></span>
-<span id="L104"><span class="lineNum">     104</span> <span class="tlaGNC">          88 :     maxExpArray[64] = 0x075af62cbac95f7dfa7fffffffffffffff;</span></span>
-<span id="L105"><span class="lineNum">     105</span> <span class="tlaGNC">          88 :     maxExpArray[65] = 0x070d7fb7452e187ac13fffffffffffffff;</span></span>
-<span id="L106"><span class="lineNum">     106</span> <span class="tlaGNC">          88 :     maxExpArray[66] = 0x06c3390ecc8af379295fffffffffffffff;</span></span>
-<span id="L107"><span class="lineNum">     107</span> <span class="tlaGNC">          88 :     maxExpArray[67] = 0x067c00a3b07ffc01fd6fffffffffffffff;</span></span>
-<span id="L108"><span class="lineNum">     108</span> <span class="tlaGNC">          88 :     maxExpArray[68] = 0x0637b647c39cbb9d3d27ffffffffffffff;</span></span>
-<span id="L109"><span class="lineNum">     109</span> <span class="tlaGNC">          88 :     maxExpArray[69] = 0x05f63b1fc104dbd39587ffffffffffffff;</span></span>
-<span id="L110"><span class="lineNum">     110</span> <span class="tlaGNC">          88 :     maxExpArray[70] = 0x05b771955b36e12f7235ffffffffffffff;</span></span>
-<span id="L111"><span class="lineNum">     111</span> <span class="tlaGNC">          88 :     maxExpArray[71] = 0x057b3d49dda84556d6f6ffffffffffffff;</span></span>
-<span id="L112"><span class="lineNum">     112</span> <span class="tlaGNC">          88 :     maxExpArray[72] = 0x054183095b2c8ececf30ffffffffffffff;</span></span>
-<span id="L113"><span class="lineNum">     113</span> <span class="tlaGNC">          88 :     maxExpArray[73] = 0x050a28be635ca2b888f77fffffffffffff;</span></span>
-<span id="L114"><span class="lineNum">     114</span> <span class="tlaGNC">          88 :     maxExpArray[74] = 0x04d5156639708c9db33c3fffffffffffff;</span></span>
-<span id="L115"><span class="lineNum">     115</span> <span class="tlaGNC">          88 :     maxExpArray[75] = 0x04a23105873875bd52dfdfffffffffffff;</span></span>
-<span id="L116"><span class="lineNum">     116</span> <span class="tlaGNC">          88 :     maxExpArray[76] = 0x0471649d87199aa990756fffffffffffff;</span></span>
-<span id="L117"><span class="lineNum">     117</span> <span class="tlaGNC">          88 :     maxExpArray[77] = 0x04429a21a029d4c1457cfbffffffffffff;</span></span>
-<span id="L118"><span class="lineNum">     118</span> <span class="tlaGNC">          88 :     maxExpArray[78] = 0x0415bc6d6fb7dd71af2cb3ffffffffffff;</span></span>
-<span id="L119"><span class="lineNum">     119</span> <span class="tlaGNC">          88 :     maxExpArray[79] = 0x03eab73b3bbfe282243ce1ffffffffffff;</span></span>
-<span id="L120"><span class="lineNum">     120</span> <span class="tlaGNC">          88 :     maxExpArray[80] = 0x03c1771ac9fb6b4c18e229ffffffffffff;</span></span>
-<span id="L121"><span class="lineNum">     121</span> <span class="tlaGNC">          88 :     maxExpArray[81] = 0x0399e96897690418f785257fffffffffff;</span></span>
-<span id="L122"><span class="lineNum">     122</span> <span class="tlaGNC">          88 :     maxExpArray[82] = 0x0373fc456c53bb779bf0ea9fffffffffff;</span></span>
-<span id="L123"><span class="lineNum">     123</span> <span class="tlaGNC">          88 :     maxExpArray[83] = 0x034f9e8e490c48e67e6ab8bfffffffffff;</span></span>
-<span id="L124"><span class="lineNum">     124</span> <span class="tlaGNC">          88 :     maxExpArray[84] = 0x032cbfd4a7adc790560b3337ffffffffff;</span></span>
-<span id="L125"><span class="lineNum">     125</span> <span class="tlaGNC">          88 :     maxExpArray[85] = 0x030b50570f6e5d2acca94613ffffffffff;</span></span>
-<span id="L126"><span class="lineNum">     126</span> <span class="tlaGNC">          88 :     maxExpArray[86] = 0x02eb40f9f620fda6b56c2861ffffffffff;</span></span>
-<span id="L127"><span class="lineNum">     127</span> <span class="tlaGNC">          88 :     maxExpArray[87] = 0x02cc8340ecb0d0f520a6af58ffffffffff;</span></span>
-<span id="L128"><span class="lineNum">     128</span> <span class="tlaGNC">          88 :     maxExpArray[88] = 0x02af09481380a0a35cf1ba02ffffffffff;</span></span>
-<span id="L129"><span class="lineNum">     129</span> <span class="tlaGNC">          88 :     maxExpArray[89] = 0x0292c5bdd3b92ec810287b1b3fffffffff;</span></span>
-<span id="L130"><span class="lineNum">     130</span> <span class="tlaGNC">          88 :     maxExpArray[90] = 0x0277abdcdab07d5a77ac6d6b9fffffffff;</span></span>
-<span id="L131"><span class="lineNum">     131</span> <span class="tlaGNC">          88 :     maxExpArray[91] = 0x025daf6654b1eaa55fd64df5efffffffff;</span></span>
-<span id="L132"><span class="lineNum">     132</span> <span class="tlaGNC">          88 :     maxExpArray[92] = 0x0244c49c648baa98192dce88b7ffffffff;</span></span>
-<span id="L133"><span class="lineNum">     133</span> <span class="tlaGNC">          88 :     maxExpArray[93] = 0x022ce03cd5619a311b2471268bffffffff;</span></span>
-<span id="L134"><span class="lineNum">     134</span> <span class="tlaGNC">          88 :     maxExpArray[94] = 0x0215f77c045fbe885654a44a0fffffffff;</span></span>
-<span id="L135"><span class="lineNum">     135</span> <span class="tlaGNC">          88 :     maxExpArray[95] = 0x01ffffffffffffffffffffffffffffffff;</span></span>
-<span id="L136"><span class="lineNum">     136</span> <span class="tlaGNC">          88 :     maxExpArray[96] = 0x01eaefdbdaaee7421fc4d3ede5ffffffff;</span></span>
-<span id="L137"><span class="lineNum">     137</span> <span class="tlaGNC">          88 :     maxExpArray[97] = 0x01d6bd8b2eb257df7e8ca57b09bfffffff;</span></span>
-<span id="L138"><span class="lineNum">     138</span> <span class="tlaGNC">          88 :     maxExpArray[98] = 0x01c35fedd14b861eb0443f7f133fffffff;</span></span>
-<span id="L139"><span class="lineNum">     139</span> <span class="tlaGNC">          88 :     maxExpArray[99] = 0x01b0ce43b322bcde4a56e8ada5afffffff;</span></span>
-<span id="L140"><span class="lineNum">     140</span> <span class="tlaGNC">          88 :     maxExpArray[100] = 0x019f0028ec1fff007f5a195a39dfffffff;</span></span>
-<span id="L141"><span class="lineNum">     141</span> <span class="tlaGNC">          88 :     maxExpArray[101] = 0x018ded91f0e72ee74f49b15ba527ffffff;</span></span>
-<span id="L142"><span class="lineNum">     142</span> <span class="tlaGNC">          88 :     maxExpArray[102] = 0x017d8ec7f04136f4e5615fd41a63ffffff;</span></span>
-<span id="L143"><span class="lineNum">     143</span> <span class="tlaGNC">          88 :     maxExpArray[103] = 0x016ddc6556cdb84bdc8d12d22e6fffffff;</span></span>
-<span id="L144"><span class="lineNum">     144</span> <span class="tlaGNC">          88 :     maxExpArray[104] = 0x015ecf52776a1155b5bd8395814f7fffff;</span></span>
-<span id="L145"><span class="lineNum">     145</span> <span class="tlaGNC">          88 :     maxExpArray[105] = 0x015060c256cb23b3b3cc3754cf40ffffff;</span></span>
-<span id="L146"><span class="lineNum">     146</span> <span class="tlaGNC">          88 :     maxExpArray[106] = 0x01428a2f98d728ae223ddab715be3fffff;</span></span>
-<span id="L147"><span class="lineNum">     147</span> <span class="tlaGNC">          88 :     maxExpArray[107] = 0x013545598e5c23276ccf0ede68034fffff;</span></span>
-<span id="L148"><span class="lineNum">     148</span> <span class="tlaGNC">          88 :     maxExpArray[108] = 0x01288c4161ce1d6f54b7f61081194fffff;</span></span>
-<span id="L149"><span class="lineNum">     149</span> <span class="tlaGNC">          88 :     maxExpArray[109] = 0x011c592761c666aa641d5a01a40f17ffff;</span></span>
-<span id="L150"><span class="lineNum">     150</span> <span class="tlaGNC">          88 :     maxExpArray[110] = 0x0110a688680a7530515f3e6e6cfdcdffff;</span></span>
-<span id="L151"><span class="lineNum">     151</span> <span class="tlaGNC">          88 :     maxExpArray[111] = 0x01056f1b5bedf75c6bcb2ce8aed428ffff;</span></span>
-<span id="L152"><span class="lineNum">     152</span> <span class="tlaGNC">          88 :     maxExpArray[112] = 0x00faadceceeff8a0890f3875f008277fff;</span></span>
-<span id="L153"><span class="lineNum">     153</span> <span class="tlaGNC">          88 :     maxExpArray[113] = 0x00f05dc6b27edad306388a600f6ba0bfff;</span></span>
-<span id="L154"><span class="lineNum">     154</span> <span class="tlaGNC">          88 :     maxExpArray[114] = 0x00e67a5a25da41063de1495d5b18cdbfff;</span></span>
-<span id="L155"><span class="lineNum">     155</span> <span class="tlaGNC">          88 :     maxExpArray[115] = 0x00dcff115b14eedde6fc3aa5353f2e4fff;</span></span>
-<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">          88 :     maxExpArray[116] = 0x00d3e7a3924312399f9aae2e0f868f8fff;</span></span>
-<span id="L157"><span class="lineNum">     157</span> <span class="tlaGNC">          88 :     maxExpArray[117] = 0x00cb2ff529eb71e41582cccd5a1ee26fff;</span></span>
-<span id="L158"><span class="lineNum">     158</span> <span class="tlaGNC">          88 :     maxExpArray[118] = 0x00c2d415c3db974ab32a51840c0b67edff;</span></span>
-<span id="L159"><span class="lineNum">     159</span> <span class="tlaGNC">          88 :     maxExpArray[119] = 0x00bad03e7d883f69ad5b0a186184e06bff;</span></span>
-<span id="L160"><span class="lineNum">     160</span> <span class="tlaGNC">          88 :     maxExpArray[120] = 0x00b320d03b2c343d4829abd6075f0cc5ff;</span></span>
-<span id="L161"><span class="lineNum">     161</span> <span class="tlaGNC">          88 :     maxExpArray[121] = 0x00abc25204e02828d73c6e80bcdb1a95bf;</span></span>
-<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">          88 :     maxExpArray[122] = 0x00a4b16f74ee4bb2040a1ec6c15fbbf2df;</span></span>
-<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">          88 :     maxExpArray[123] = 0x009deaf736ac1f569deb1b5ae3f36c130f;</span></span>
-<span id="L164"><span class="lineNum">     164</span> <span class="tlaGNC">          88 :     maxExpArray[124] = 0x00976bd9952c7aa957f5937d790ef65037;</span></span>
-<span id="L165"><span class="lineNum">     165</span> <span class="tlaGNC">          88 :     maxExpArray[125] = 0x009131271922eaa6064b73a22d0bd4f2bf;</span></span>
-<span id="L166"><span class="lineNum">     166</span> <span class="tlaGNC">          88 :     maxExpArray[126] = 0x008b380f3558668c46c91c49a2f8e967b9;</span></span>
-<span id="L167"><span class="lineNum">     167</span> <span class="tlaGNC">          88 :     maxExpArray[127] = 0x00857ddf0117efa215952912839f6473e6;</span></span>
+<span id="L72"><span class="lineNum">      72</span> <span class="tlaGNC tlaBgGNC">          94 :     maxExpArray[32] = 0x1c35fedd14ffffffffffffffffffffffff;</span></span>
+<span id="L73"><span class="lineNum">      73</span> <span class="tlaGNC">          94 :     maxExpArray[33] = 0x1b0ce43b323fffffffffffffffffffffff;</span></span>
+<span id="L74"><span class="lineNum">      74</span> <span class="tlaGNC">          94 :     maxExpArray[34] = 0x19f0028ec1ffffffffffffffffffffffff;</span></span>
+<span id="L75"><span class="lineNum">      75</span> <span class="tlaGNC">          94 :     maxExpArray[35] = 0x18ded91f0e7fffffffffffffffffffffff;</span></span>
+<span id="L76"><span class="lineNum">      76</span> <span class="tlaGNC">          94 :     maxExpArray[36] = 0x17d8ec7f0417ffffffffffffffffffffff;</span></span>
+<span id="L77"><span class="lineNum">      77</span> <span class="tlaGNC">          94 :     maxExpArray[37] = 0x16ddc6556cdbffffffffffffffffffffff;</span></span>
+<span id="L78"><span class="lineNum">      78</span> <span class="tlaGNC">          94 :     maxExpArray[38] = 0x15ecf52776a1ffffffffffffffffffffff;</span></span>
+<span id="L79"><span class="lineNum">      79</span> <span class="tlaGNC">          94 :     maxExpArray[39] = 0x15060c256cb2ffffffffffffffffffffff;</span></span>
+<span id="L80"><span class="lineNum">      80</span> <span class="tlaGNC">          94 :     maxExpArray[40] = 0x1428a2f98d72ffffffffffffffffffffff;</span></span>
+<span id="L81"><span class="lineNum">      81</span> <span class="tlaGNC">          94 :     maxExpArray[41] = 0x13545598e5c23fffffffffffffffffffff;</span></span>
+<span id="L82"><span class="lineNum">      82</span> <span class="tlaGNC">          94 :     maxExpArray[42] = 0x1288c4161ce1dfffffffffffffffffffff;</span></span>
+<span id="L83"><span class="lineNum">      83</span> <span class="tlaGNC">          94 :     maxExpArray[43] = 0x11c592761c666fffffffffffffffffffff;</span></span>
+<span id="L84"><span class="lineNum">      84</span> <span class="tlaGNC">          94 :     maxExpArray[44] = 0x110a688680a757ffffffffffffffffffff;</span></span>
+<span id="L85"><span class="lineNum">      85</span> <span class="tlaGNC">          94 :     maxExpArray[45] = 0x1056f1b5bedf77ffffffffffffffffffff;</span></span>
+<span id="L86"><span class="lineNum">      86</span> <span class="tlaGNC">          94 :     maxExpArray[46] = 0x0faadceceeff8bffffffffffffffffffff;</span></span>
+<span id="L87"><span class="lineNum">      87</span> <span class="tlaGNC">          94 :     maxExpArray[47] = 0x0f05dc6b27edadffffffffffffffffffff;</span></span>
+<span id="L88"><span class="lineNum">      88</span> <span class="tlaGNC">          94 :     maxExpArray[48] = 0x0e67a5a25da4107fffffffffffffffffff;</span></span>
+<span id="L89"><span class="lineNum">      89</span> <span class="tlaGNC">          94 :     maxExpArray[49] = 0x0dcff115b14eedffffffffffffffffffff;</span></span>
+<span id="L90"><span class="lineNum">      90</span> <span class="tlaGNC">          94 :     maxExpArray[50] = 0x0d3e7a392431239fffffffffffffffffff;</span></span>
+<span id="L91"><span class="lineNum">      91</span> <span class="tlaGNC">          94 :     maxExpArray[51] = 0x0cb2ff529eb71e4fffffffffffffffffff;</span></span>
+<span id="L92"><span class="lineNum">      92</span> <span class="tlaGNC">          94 :     maxExpArray[52] = 0x0c2d415c3db974afffffffffffffffffff;</span></span>
+<span id="L93"><span class="lineNum">      93</span> <span class="tlaGNC">          94 :     maxExpArray[53] = 0x0bad03e7d883f69bffffffffffffffffff;</span></span>
+<span id="L94"><span class="lineNum">      94</span> <span class="tlaGNC">          94 :     maxExpArray[54] = 0x0b320d03b2c343d5ffffffffffffffffff;</span></span>
+<span id="L95"><span class="lineNum">      95</span> <span class="tlaGNC">          94 :     maxExpArray[55] = 0x0abc25204e02828dffffffffffffffffff;</span></span>
+<span id="L96"><span class="lineNum">      96</span> <span class="tlaGNC">          94 :     maxExpArray[56] = 0x0a4b16f74ee4bb207fffffffffffffffff;</span></span>
+<span id="L97"><span class="lineNum">      97</span> <span class="tlaGNC">          94 :     maxExpArray[57] = 0x09deaf736ac1f569ffffffffffffffffff;</span></span>
+<span id="L98"><span class="lineNum">      98</span> <span class="tlaGNC">          94 :     maxExpArray[58] = 0x0976bd9952c7aa957fffffffffffffffff;</span></span>
+<span id="L99"><span class="lineNum">      99</span> <span class="tlaGNC">          94 :     maxExpArray[59] = 0x09131271922eaa606fffffffffffffffff;</span></span>
+<span id="L100"><span class="lineNum">     100</span> <span class="tlaGNC">          94 :     maxExpArray[60] = 0x08b380f3558668c46fffffffffffffffff;</span></span>
+<span id="L101"><span class="lineNum">     101</span> <span class="tlaGNC">          94 :     maxExpArray[61] = 0x0857ddf0117efa215bffffffffffffffff;</span></span>
+<span id="L102"><span class="lineNum">     102</span> <span class="tlaGNC">          94 :     maxExpArray[62] = 0x07ffffffffffffffffffffffffffffffff;</span></span>
+<span id="L103"><span class="lineNum">     103</span> <span class="tlaGNC">          94 :     maxExpArray[63] = 0x07abbf6f6abb9d087fffffffffffffffff;</span></span>
+<span id="L104"><span class="lineNum">     104</span> <span class="tlaGNC">          94 :     maxExpArray[64] = 0x075af62cbac95f7dfa7fffffffffffffff;</span></span>
+<span id="L105"><span class="lineNum">     105</span> <span class="tlaGNC">          94 :     maxExpArray[65] = 0x070d7fb7452e187ac13fffffffffffffff;</span></span>
+<span id="L106"><span class="lineNum">     106</span> <span class="tlaGNC">          94 :     maxExpArray[66] = 0x06c3390ecc8af379295fffffffffffffff;</span></span>
+<span id="L107"><span class="lineNum">     107</span> <span class="tlaGNC">          94 :     maxExpArray[67] = 0x067c00a3b07ffc01fd6fffffffffffffff;</span></span>
+<span id="L108"><span class="lineNum">     108</span> <span class="tlaGNC">          94 :     maxExpArray[68] = 0x0637b647c39cbb9d3d27ffffffffffffff;</span></span>
+<span id="L109"><span class="lineNum">     109</span> <span class="tlaGNC">          94 :     maxExpArray[69] = 0x05f63b1fc104dbd39587ffffffffffffff;</span></span>
+<span id="L110"><span class="lineNum">     110</span> <span class="tlaGNC">          94 :     maxExpArray[70] = 0x05b771955b36e12f7235ffffffffffffff;</span></span>
+<span id="L111"><span class="lineNum">     111</span> <span class="tlaGNC">          94 :     maxExpArray[71] = 0x057b3d49dda84556d6f6ffffffffffffff;</span></span>
+<span id="L112"><span class="lineNum">     112</span> <span class="tlaGNC">          94 :     maxExpArray[72] = 0x054183095b2c8ececf30ffffffffffffff;</span></span>
+<span id="L113"><span class="lineNum">     113</span> <span class="tlaGNC">          94 :     maxExpArray[73] = 0x050a28be635ca2b888f77fffffffffffff;</span></span>
+<span id="L114"><span class="lineNum">     114</span> <span class="tlaGNC">          94 :     maxExpArray[74] = 0x04d5156639708c9db33c3fffffffffffff;</span></span>
+<span id="L115"><span class="lineNum">     115</span> <span class="tlaGNC">          94 :     maxExpArray[75] = 0x04a23105873875bd52dfdfffffffffffff;</span></span>
+<span id="L116"><span class="lineNum">     116</span> <span class="tlaGNC">          94 :     maxExpArray[76] = 0x0471649d87199aa990756fffffffffffff;</span></span>
+<span id="L117"><span class="lineNum">     117</span> <span class="tlaGNC">          94 :     maxExpArray[77] = 0x04429a21a029d4c1457cfbffffffffffff;</span></span>
+<span id="L118"><span class="lineNum">     118</span> <span class="tlaGNC">          94 :     maxExpArray[78] = 0x0415bc6d6fb7dd71af2cb3ffffffffffff;</span></span>
+<span id="L119"><span class="lineNum">     119</span> <span class="tlaGNC">          94 :     maxExpArray[79] = 0x03eab73b3bbfe282243ce1ffffffffffff;</span></span>
+<span id="L120"><span class="lineNum">     120</span> <span class="tlaGNC">          94 :     maxExpArray[80] = 0x03c1771ac9fb6b4c18e229ffffffffffff;</span></span>
+<span id="L121"><span class="lineNum">     121</span> <span class="tlaGNC">          94 :     maxExpArray[81] = 0x0399e96897690418f785257fffffffffff;</span></span>
+<span id="L122"><span class="lineNum">     122</span> <span class="tlaGNC">          94 :     maxExpArray[82] = 0x0373fc456c53bb779bf0ea9fffffffffff;</span></span>
+<span id="L123"><span class="lineNum">     123</span> <span class="tlaGNC">          94 :     maxExpArray[83] = 0x034f9e8e490c48e67e6ab8bfffffffffff;</span></span>
+<span id="L124"><span class="lineNum">     124</span> <span class="tlaGNC">          94 :     maxExpArray[84] = 0x032cbfd4a7adc790560b3337ffffffffff;</span></span>
+<span id="L125"><span class="lineNum">     125</span> <span class="tlaGNC">          94 :     maxExpArray[85] = 0x030b50570f6e5d2acca94613ffffffffff;</span></span>
+<span id="L126"><span class="lineNum">     126</span> <span class="tlaGNC">          94 :     maxExpArray[86] = 0x02eb40f9f620fda6b56c2861ffffffffff;</span></span>
+<span id="L127"><span class="lineNum">     127</span> <span class="tlaGNC">          94 :     maxExpArray[87] = 0x02cc8340ecb0d0f520a6af58ffffffffff;</span></span>
+<span id="L128"><span class="lineNum">     128</span> <span class="tlaGNC">          94 :     maxExpArray[88] = 0x02af09481380a0a35cf1ba02ffffffffff;</span></span>
+<span id="L129"><span class="lineNum">     129</span> <span class="tlaGNC">          94 :     maxExpArray[89] = 0x0292c5bdd3b92ec810287b1b3fffffffff;</span></span>
+<span id="L130"><span class="lineNum">     130</span> <span class="tlaGNC">          94 :     maxExpArray[90] = 0x0277abdcdab07d5a77ac6d6b9fffffffff;</span></span>
+<span id="L131"><span class="lineNum">     131</span> <span class="tlaGNC">          94 :     maxExpArray[91] = 0x025daf6654b1eaa55fd64df5efffffffff;</span></span>
+<span id="L132"><span class="lineNum">     132</span> <span class="tlaGNC">          94 :     maxExpArray[92] = 0x0244c49c648baa98192dce88b7ffffffff;</span></span>
+<span id="L133"><span class="lineNum">     133</span> <span class="tlaGNC">          94 :     maxExpArray[93] = 0x022ce03cd5619a311b2471268bffffffff;</span></span>
+<span id="L134"><span class="lineNum">     134</span> <span class="tlaGNC">          94 :     maxExpArray[94] = 0x0215f77c045fbe885654a44a0fffffffff;</span></span>
+<span id="L135"><span class="lineNum">     135</span> <span class="tlaGNC">          94 :     maxExpArray[95] = 0x01ffffffffffffffffffffffffffffffff;</span></span>
+<span id="L136"><span class="lineNum">     136</span> <span class="tlaGNC">          94 :     maxExpArray[96] = 0x01eaefdbdaaee7421fc4d3ede5ffffffff;</span></span>
+<span id="L137"><span class="lineNum">     137</span> <span class="tlaGNC">          94 :     maxExpArray[97] = 0x01d6bd8b2eb257df7e8ca57b09bfffffff;</span></span>
+<span id="L138"><span class="lineNum">     138</span> <span class="tlaGNC">          94 :     maxExpArray[98] = 0x01c35fedd14b861eb0443f7f133fffffff;</span></span>
+<span id="L139"><span class="lineNum">     139</span> <span class="tlaGNC">          94 :     maxExpArray[99] = 0x01b0ce43b322bcde4a56e8ada5afffffff;</span></span>
+<span id="L140"><span class="lineNum">     140</span> <span class="tlaGNC">          94 :     maxExpArray[100] = 0x019f0028ec1fff007f5a195a39dfffffff;</span></span>
+<span id="L141"><span class="lineNum">     141</span> <span class="tlaGNC">          94 :     maxExpArray[101] = 0x018ded91f0e72ee74f49b15ba527ffffff;</span></span>
+<span id="L142"><span class="lineNum">     142</span> <span class="tlaGNC">          94 :     maxExpArray[102] = 0x017d8ec7f04136f4e5615fd41a63ffffff;</span></span>
+<span id="L143"><span class="lineNum">     143</span> <span class="tlaGNC">          94 :     maxExpArray[103] = 0x016ddc6556cdb84bdc8d12d22e6fffffff;</span></span>
+<span id="L144"><span class="lineNum">     144</span> <span class="tlaGNC">          94 :     maxExpArray[104] = 0x015ecf52776a1155b5bd8395814f7fffff;</span></span>
+<span id="L145"><span class="lineNum">     145</span> <span class="tlaGNC">          94 :     maxExpArray[105] = 0x015060c256cb23b3b3cc3754cf40ffffff;</span></span>
+<span id="L146"><span class="lineNum">     146</span> <span class="tlaGNC">          94 :     maxExpArray[106] = 0x01428a2f98d728ae223ddab715be3fffff;</span></span>
+<span id="L147"><span class="lineNum">     147</span> <span class="tlaGNC">          94 :     maxExpArray[107] = 0x013545598e5c23276ccf0ede68034fffff;</span></span>
+<span id="L148"><span class="lineNum">     148</span> <span class="tlaGNC">          94 :     maxExpArray[108] = 0x01288c4161ce1d6f54b7f61081194fffff;</span></span>
+<span id="L149"><span class="lineNum">     149</span> <span class="tlaGNC">          94 :     maxExpArray[109] = 0x011c592761c666aa641d5a01a40f17ffff;</span></span>
+<span id="L150"><span class="lineNum">     150</span> <span class="tlaGNC">          94 :     maxExpArray[110] = 0x0110a688680a7530515f3e6e6cfdcdffff;</span></span>
+<span id="L151"><span class="lineNum">     151</span> <span class="tlaGNC">          94 :     maxExpArray[111] = 0x01056f1b5bedf75c6bcb2ce8aed428ffff;</span></span>
+<span id="L152"><span class="lineNum">     152</span> <span class="tlaGNC">          94 :     maxExpArray[112] = 0x00faadceceeff8a0890f3875f008277fff;</span></span>
+<span id="L153"><span class="lineNum">     153</span> <span class="tlaGNC">          94 :     maxExpArray[113] = 0x00f05dc6b27edad306388a600f6ba0bfff;</span></span>
+<span id="L154"><span class="lineNum">     154</span> <span class="tlaGNC">          94 :     maxExpArray[114] = 0x00e67a5a25da41063de1495d5b18cdbfff;</span></span>
+<span id="L155"><span class="lineNum">     155</span> <span class="tlaGNC">          94 :     maxExpArray[115] = 0x00dcff115b14eedde6fc3aa5353f2e4fff;</span></span>
+<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">          94 :     maxExpArray[116] = 0x00d3e7a3924312399f9aae2e0f868f8fff;</span></span>
+<span id="L157"><span class="lineNum">     157</span> <span class="tlaGNC">          94 :     maxExpArray[117] = 0x00cb2ff529eb71e41582cccd5a1ee26fff;</span></span>
+<span id="L158"><span class="lineNum">     158</span> <span class="tlaGNC">          94 :     maxExpArray[118] = 0x00c2d415c3db974ab32a51840c0b67edff;</span></span>
+<span id="L159"><span class="lineNum">     159</span> <span class="tlaGNC">          94 :     maxExpArray[119] = 0x00bad03e7d883f69ad5b0a186184e06bff;</span></span>
+<span id="L160"><span class="lineNum">     160</span> <span class="tlaGNC">          94 :     maxExpArray[120] = 0x00b320d03b2c343d4829abd6075f0cc5ff;</span></span>
+<span id="L161"><span class="lineNum">     161</span> <span class="tlaGNC">          94 :     maxExpArray[121] = 0x00abc25204e02828d73c6e80bcdb1a95bf;</span></span>
+<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">          94 :     maxExpArray[122] = 0x00a4b16f74ee4bb2040a1ec6c15fbbf2df;</span></span>
+<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">          94 :     maxExpArray[123] = 0x009deaf736ac1f569deb1b5ae3f36c130f;</span></span>
+<span id="L164"><span class="lineNum">     164</span> <span class="tlaGNC">          94 :     maxExpArray[124] = 0x00976bd9952c7aa957f5937d790ef65037;</span></span>
+<span id="L165"><span class="lineNum">     165</span> <span class="tlaGNC">          94 :     maxExpArray[125] = 0x009131271922eaa6064b73a22d0bd4f2bf;</span></span>
+<span id="L166"><span class="lineNum">     166</span> <span class="tlaGNC">          94 :     maxExpArray[126] = 0x008b380f3558668c46c91c49a2f8e967b9;</span></span>
+<span id="L167"><span class="lineNum">     167</span> <span class="tlaGNC">          94 :     maxExpArray[127] = 0x00857ddf0117efa215952912839f6473e6;</span></span>
 <span id="L168"><span class="lineNum">     168</span>              :   }</span>
 <span id="L169"><span class="lineNum">     169</span>              : </span>
 <span id="L170"><span class="lineNum">     170</span>              :   /**</span>
 <span id="L171"><span class="lineNum">     171</span>              :    * @dev should be executed after construction (too large for the constructor)</span>
 <span id="L172"><span class="lineNum">     172</span>              :    */</span>
 <span id="L173"><span class="lineNum">     173</span>              :   function init() public {</span>
-<span id="L174"><span class="lineNum">     174</span> <span class="tlaGNC">          88 :     initMaxExpArray();</span></span>
+<span id="L174"><span class="lineNum">     174</span> <span class="tlaGNC">          94 :     initMaxExpArray();</span></span>
 <span id="L175"><span class="lineNum">     175</span>              :   }</span>
 <span id="L176"><span class="lineNum">     176</span>              : </span>
 <span id="L177"><span class="lineNum">     177</span>              :   /**</span>
@@ -257,22 +257,22 @@
 <span id="L195"><span class="lineNum">     195</span>              :     uint256 _amount</span>
 <span id="L196"><span class="lineNum">     196</span>              :   ) internal view returns (uint256) {</span>
 <span id="L197"><span class="lineNum">     197</span>              :     // validate input</span>
-<span id="L198"><span class="lineNum">     198</span> <span class="tlaGNC">           4 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
-<span id="L199"><span class="lineNum">     199</span> <span class="tlaGNC">           4 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
-<span id="L200"><span class="lineNum">     200</span> <span class="tlaGNC">           4 :     require(_reserveWeight &gt; 0 &amp;&amp; _reserveWeight &lt;= MAX_WEIGHT, &quot;ERR_INVALID_RESERVE_WEIGHT&quot;);</span></span>
+<span id="L198"><span class="lineNum">     198</span> <span class="tlaGNC">           6 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
+<span id="L199"><span class="lineNum">     199</span> <span class="tlaGNC">           6 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
+<span id="L200"><span class="lineNum">     200</span> <span class="tlaGNC">           6 :     require(_reserveWeight &gt; 0 &amp;&amp; _reserveWeight &lt;= MAX_WEIGHT, &quot;ERR_INVALID_RESERVE_WEIGHT&quot;);</span></span>
 <span id="L201"><span class="lineNum">     201</span>              : </span>
 <span id="L202"><span class="lineNum">     202</span>              :     // special case for 0 deposit amount</span>
-<span id="L203"><span class="lineNum">     203</span> <span class="tlaGNC">           4 :     if (_amount == 0) return 0;</span></span>
+<span id="L203"><span class="lineNum">     203</span> <span class="tlaGNC">           6 :     if (_amount == 0) return 0;</span></span>
 <span id="L204"><span class="lineNum">     204</span>              : </span>
 <span id="L205"><span class="lineNum">     205</span>              :     // special case if the weight = 100%</span>
-<span id="L206"><span class="lineNum">     206</span> <span class="tlaGNC">           4 :     if (_reserveWeight == MAX_WEIGHT) return (_supply * _amount) / _reserveBalance;</span></span>
+<span id="L206"><span class="lineNum">     206</span> <span class="tlaGNC">           6 :     if (_reserveWeight == MAX_WEIGHT) return (_supply * _amount) / _reserveBalance;</span></span>
 <span id="L207"><span class="lineNum">     207</span>              : </span>
-<span id="L208"><span class="lineNum">     208</span> <span class="tlaGNC">           4 :     uint256 result;</span></span>
-<span id="L209"><span class="lineNum">     209</span> <span class="tlaGNC">           4 :     uint8 precision;</span></span>
-<span id="L210"><span class="lineNum">     210</span> <span class="tlaGNC">           4 :     uint256 baseN = _amount + _reserveBalance;</span></span>
-<span id="L211"><span class="lineNum">     211</span> <span class="tlaGNC">           4 :     (result, precision) = power(baseN, _reserveBalance, _reserveWeight, MAX_WEIGHT);</span></span>
-<span id="L212"><span class="lineNum">     212</span> <span class="tlaGNC">           4 :     uint256 temp = (_supply * result) &gt;&gt; precision;</span></span>
-<span id="L213"><span class="lineNum">     213</span> <span class="tlaGNC">           4 :     return temp - _supply;</span></span>
+<span id="L208"><span class="lineNum">     208</span> <span class="tlaGNC">           6 :     uint256 result;</span></span>
+<span id="L209"><span class="lineNum">     209</span> <span class="tlaGNC">           6 :     uint8 precision;</span></span>
+<span id="L210"><span class="lineNum">     210</span> <span class="tlaGNC">           6 :     uint256 baseN = _amount + _reserveBalance;</span></span>
+<span id="L211"><span class="lineNum">     211</span> <span class="tlaGNC">           6 :     (result, precision) = power(baseN, _reserveBalance, _reserveWeight, MAX_WEIGHT);</span></span>
+<span id="L212"><span class="lineNum">     212</span> <span class="tlaGNC">           6 :     uint256 temp = (_supply * result) &gt;&gt; precision;</span></span>
+<span id="L213"><span class="lineNum">     213</span> <span class="tlaGNC">           6 :     return temp - _supply;</span></span>
 <span id="L214"><span class="lineNum">     214</span>              :   }</span>
 <span id="L215"><span class="lineNum">     215</span>              : </span>
 <span id="L216"><span class="lineNum">     216</span>              :   /**</span>
@@ -296,27 +296,27 @@
 <span id="L234"><span class="lineNum">     234</span>              :     uint256 _amount</span>
 <span id="L235"><span class="lineNum">     235</span>              :   ) internal view returns (uint256) {</span>
 <span id="L236"><span class="lineNum">     236</span>              :     // validate input</span>
-<span id="L237"><span class="lineNum">     237</span> <span class="tlaGNC">           3 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
-<span id="L238"><span class="lineNum">     238</span> <span class="tlaGNC">           3 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
-<span id="L239"><span class="lineNum">     239</span> <span class="tlaGNC">           3 :     require(_reserveWeight &gt; 0 &amp;&amp; _reserveWeight &lt;= MAX_WEIGHT, &quot;ERR_INVALID_RESERVE_WEIGHT&quot;);</span></span>
-<span id="L240"><span class="lineNum">     240</span> <span class="tlaGNC">           3 :     require(_amount &lt;= _supply, &quot;ERR_INVALID_AMOUNT&quot;);</span></span>
+<span id="L237"><span class="lineNum">     237</span> <span class="tlaGNC">           5 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
+<span id="L238"><span class="lineNum">     238</span> <span class="tlaGNC">           5 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
+<span id="L239"><span class="lineNum">     239</span> <span class="tlaGNC">           5 :     require(_reserveWeight &gt; 0 &amp;&amp; _reserveWeight &lt;= MAX_WEIGHT, &quot;ERR_INVALID_RESERVE_WEIGHT&quot;);</span></span>
+<span id="L240"><span class="lineNum">     240</span> <span class="tlaGNC">           5 :     require(_amount &lt;= _supply, &quot;ERR_INVALID_AMOUNT&quot;);</span></span>
 <span id="L241"><span class="lineNum">     241</span>              : </span>
 <span id="L242"><span class="lineNum">     242</span>              :     // special case for 0 sell amount</span>
-<span id="L243"><span class="lineNum">     243</span> <span class="tlaGNC">           3 :     if (_amount == 0) return 0;</span></span>
+<span id="L243"><span class="lineNum">     243</span> <span class="tlaGNC">           5 :     if (_amount == 0) return 0;</span></span>
 <span id="L244"><span class="lineNum">     244</span>              : </span>
 <span id="L245"><span class="lineNum">     245</span>              :     // special case for selling the entire supply</span>
-<span id="L246"><span class="lineNum">     246</span> <span class="tlaGNC">           3 :     if (_amount == _supply) return _reserveBalance;</span></span>
+<span id="L246"><span class="lineNum">     246</span> <span class="tlaGNC">           5 :     if (_amount == _supply) return _reserveBalance;</span></span>
 <span id="L247"><span class="lineNum">     247</span>              : </span>
 <span id="L248"><span class="lineNum">     248</span>              :     // special case if the weight = 100%</span>
-<span id="L249"><span class="lineNum">     249</span> <span class="tlaGNC">           3 :     if (_reserveWeight == MAX_WEIGHT) return (_reserveBalance * _amount) / _supply;</span></span>
+<span id="L249"><span class="lineNum">     249</span> <span class="tlaGNC">           5 :     if (_reserveWeight == MAX_WEIGHT) return (_reserveBalance * _amount) / _supply;</span></span>
 <span id="L250"><span class="lineNum">     250</span>              : </span>
-<span id="L251"><span class="lineNum">     251</span> <span class="tlaGNC">           3 :     uint256 result;</span></span>
-<span id="L252"><span class="lineNum">     252</span> <span class="tlaGNC">           3 :     uint8 precision;</span></span>
-<span id="L253"><span class="lineNum">     253</span> <span class="tlaGNC">           3 :     uint256 baseD = _supply - _amount;</span></span>
-<span id="L254"><span class="lineNum">     254</span> <span class="tlaGNC">           3 :     (result, precision) = power(_supply, baseD, MAX_WEIGHT, _reserveWeight);</span></span>
-<span id="L255"><span class="lineNum">     255</span> <span class="tlaGNC">           3 :     uint256 temp1 = _reserveBalance * result;</span></span>
-<span id="L256"><span class="lineNum">     256</span> <span class="tlaGNC">           3 :     uint256 temp2 = _reserveBalance &lt;&lt; precision;</span></span>
-<span id="L257"><span class="lineNum">     257</span> <span class="tlaGNC">           3 :     return (temp1 - temp2) / result;</span></span>
+<span id="L251"><span class="lineNum">     251</span> <span class="tlaGNC">           5 :     uint256 result;</span></span>
+<span id="L252"><span class="lineNum">     252</span> <span class="tlaGNC">           5 :     uint8 precision;</span></span>
+<span id="L253"><span class="lineNum">     253</span> <span class="tlaGNC">           5 :     uint256 baseD = _supply - _amount;</span></span>
+<span id="L254"><span class="lineNum">     254</span> <span class="tlaGNC">           5 :     (result, precision) = power(_supply, baseD, MAX_WEIGHT, _reserveWeight);</span></span>
+<span id="L255"><span class="lineNum">     255</span> <span class="tlaGNC">           5 :     uint256 temp1 = _reserveBalance * result;</span></span>
+<span id="L256"><span class="lineNum">     256</span> <span class="tlaGNC">           5 :     uint256 temp2 = _reserveBalance &lt;&lt; precision;</span></span>
+<span id="L257"><span class="lineNum">     257</span> <span class="tlaGNC">           5 :     return (temp1 - temp2) / result;</span></span>
 <span id="L258"><span class="lineNum">     258</span>              :   }</span>
 <span id="L259"><span class="lineNum">     259</span>              : </span>
 <span id="L260"><span class="lineNum">     260</span>              :   /**</span>
@@ -340,22 +340,22 @@
 <span id="L278"><span class="lineNum">     278</span>              :     uint256 _amount</span>
 <span id="L279"><span class="lineNum">     279</span>              :   ) internal view returns (uint256) {</span>
 <span id="L280"><span class="lineNum">     280</span>              :     // validate input</span>
-<span id="L281"><span class="lineNum">     281</span> <span class="tlaGNC">           4 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
-<span id="L282"><span class="lineNum">     282</span> <span class="tlaGNC">           4 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
-<span id="L283"><span class="lineNum">     283</span> <span class="tlaGNC">           4 :     require(_reserveRatio &gt; 1 &amp;&amp; _reserveRatio &lt;= MAX_WEIGHT * 2, &quot;ERR_INVALID_RESERVE_RATIO&quot;);</span></span>
+<span id="L281"><span class="lineNum">     281</span> <span class="tlaGNC">           6 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
+<span id="L282"><span class="lineNum">     282</span> <span class="tlaGNC">           6 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
+<span id="L283"><span class="lineNum">     283</span> <span class="tlaGNC">           6 :     require(_reserveRatio &gt; 1 &amp;&amp; _reserveRatio &lt;= MAX_WEIGHT * 2, &quot;ERR_INVALID_RESERVE_RATIO&quot;);</span></span>
 <span id="L284"><span class="lineNum">     284</span>              : </span>
 <span id="L285"><span class="lineNum">     285</span>              :     // special case for 0 amount</span>
-<span id="L286"><span class="lineNum">     286</span> <span class="tlaGNC">           4 :     if (_amount == 0) return 0;</span></span>
+<span id="L286"><span class="lineNum">     286</span> <span class="tlaGNC">           6 :     if (_amount == 0) return 0;</span></span>
 <span id="L287"><span class="lineNum">     287</span>              : </span>
 <span id="L288"><span class="lineNum">     288</span>              :     // special case if the reserve ratio = 100%</span>
-<span id="L289"><span class="lineNum">     289</span> <span class="tlaGNC">           4 :     if (_reserveRatio == MAX_WEIGHT) return (_amount * _reserveBalance - 1) / _supply + 1;</span></span>
+<span id="L289"><span class="lineNum">     289</span> <span class="tlaGNC">           6 :     if (_reserveRatio == MAX_WEIGHT) return (_amount * _reserveBalance - 1) / _supply + 1;</span></span>
 <span id="L290"><span class="lineNum">     290</span>              : </span>
-<span id="L291"><span class="lineNum">     291</span> <span class="tlaGNC">           4 :     uint256 result;</span></span>
-<span id="L292"><span class="lineNum">     292</span> <span class="tlaGNC">           4 :     uint8 precision;</span></span>
-<span id="L293"><span class="lineNum">     293</span> <span class="tlaGNC">           4 :     uint256 baseN = _supply + _amount;</span></span>
-<span id="L294"><span class="lineNum">     294</span> <span class="tlaGNC">           4 :     (result, precision) = power(baseN, _supply, MAX_WEIGHT, _reserveRatio);</span></span>
-<span id="L295"><span class="lineNum">     295</span> <span class="tlaGNC">           4 :     uint256 temp = ((_reserveBalance * result - 1) &gt;&gt; precision) + 1;</span></span>
-<span id="L296"><span class="lineNum">     296</span> <span class="tlaGNC">           4 :     return temp - _reserveBalance;</span></span>
+<span id="L291"><span class="lineNum">     291</span> <span class="tlaGNC">           6 :     uint256 result;</span></span>
+<span id="L292"><span class="lineNum">     292</span> <span class="tlaGNC">           6 :     uint8 precision;</span></span>
+<span id="L293"><span class="lineNum">     293</span> <span class="tlaGNC">           6 :     uint256 baseN = _supply + _amount;</span></span>
+<span id="L294"><span class="lineNum">     294</span> <span class="tlaGNC">           6 :     (result, precision) = power(baseN, _supply, MAX_WEIGHT, _reserveRatio);</span></span>
+<span id="L295"><span class="lineNum">     295</span> <span class="tlaGNC">           6 :     uint256 temp = ((_reserveBalance * result - 1) &gt;&gt; precision) + 1;</span></span>
+<span id="L296"><span class="lineNum">     296</span> <span class="tlaGNC">           6 :     return temp - _reserveBalance;</span></span>
 <span id="L297"><span class="lineNum">     297</span>              :   }</span>
 <span id="L298"><span class="lineNum">     298</span>              : </span>
 <span id="L299"><span class="lineNum">     299</span>              :   /**</span>
@@ -379,22 +379,22 @@
 <span id="L317"><span class="lineNum">     317</span>              :     uint256 _amount</span>
 <span id="L318"><span class="lineNum">     318</span>              :   ) internal view returns (uint256) {</span>
 <span id="L319"><span class="lineNum">     319</span>              :     // validate input</span>
-<span id="L320"><span class="lineNum">     320</span> <span class="tlaGNC">           3 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
-<span id="L321"><span class="lineNum">     321</span> <span class="tlaGNC">           3 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
-<span id="L322"><span class="lineNum">     322</span> <span class="tlaGNC">           3 :     require(_reserveRatio &gt; 1 &amp;&amp; _reserveRatio &lt;= MAX_WEIGHT * 2, &quot;ERR_INVALID_RESERVE_RATIO&quot;);</span></span>
+<span id="L320"><span class="lineNum">     320</span> <span class="tlaGNC">           5 :     require(_supply &gt; 0, &quot;ERR_INVALID_SUPPLY&quot;);</span></span>
+<span id="L321"><span class="lineNum">     321</span> <span class="tlaGNC">           5 :     require(_reserveBalance &gt; 0, &quot;ERR_INVALID_RESERVE_BALANCE&quot;);</span></span>
+<span id="L322"><span class="lineNum">     322</span> <span class="tlaGNC">           5 :     require(_reserveRatio &gt; 1 &amp;&amp; _reserveRatio &lt;= MAX_WEIGHT * 2, &quot;ERR_INVALID_RESERVE_RATIO&quot;);</span></span>
 <span id="L323"><span class="lineNum">     323</span>              : </span>
 <span id="L324"><span class="lineNum">     324</span>              :     // special case for 0 amount</span>
-<span id="L325"><span class="lineNum">     325</span> <span class="tlaGNC">           3 :     if (_amount == 0) return 0;</span></span>
+<span id="L325"><span class="lineNum">     325</span> <span class="tlaGNC">           5 :     if (_amount == 0) return 0;</span></span>
 <span id="L326"><span class="lineNum">     326</span>              : </span>
 <span id="L327"><span class="lineNum">     327</span>              :     // special case if the reserve ratio = 100%</span>
-<span id="L328"><span class="lineNum">     328</span> <span class="tlaGNC">           3 :     if (_reserveRatio == MAX_WEIGHT) return (_amount * _supply) / _reserveBalance;</span></span>
+<span id="L328"><span class="lineNum">     328</span> <span class="tlaGNC">           5 :     if (_reserveRatio == MAX_WEIGHT) return (_amount * _supply) / _reserveBalance;</span></span>
 <span id="L329"><span class="lineNum">     329</span>              : </span>
-<span id="L330"><span class="lineNum">     330</span> <span class="tlaGNC">           3 :     uint256 result;</span></span>
-<span id="L331"><span class="lineNum">     331</span> <span class="tlaGNC">           3 :     uint8 precision;</span></span>
-<span id="L332"><span class="lineNum">     332</span> <span class="tlaGNC">           3 :     uint256 baseN = _reserveBalance + _amount;</span></span>
-<span id="L333"><span class="lineNum">     333</span> <span class="tlaGNC">           3 :     (result, precision) = power(baseN, _reserveBalance, _reserveRatio, MAX_WEIGHT);</span></span>
-<span id="L334"><span class="lineNum">     334</span> <span class="tlaGNC">           3 :     uint256 temp = (_supply * result) &gt;&gt; precision;</span></span>
-<span id="L335"><span class="lineNum">     335</span> <span class="tlaGNC">           3 :     return temp - _supply;</span></span>
+<span id="L330"><span class="lineNum">     330</span> <span class="tlaGNC">           5 :     uint256 result;</span></span>
+<span id="L331"><span class="lineNum">     331</span> <span class="tlaGNC">           5 :     uint8 precision;</span></span>
+<span id="L332"><span class="lineNum">     332</span> <span class="tlaGNC">           5 :     uint256 baseN = _reserveBalance + _amount;</span></span>
+<span id="L333"><span class="lineNum">     333</span> <span class="tlaGNC">           5 :     (result, precision) = power(baseN, _reserveBalance, _reserveRatio, MAX_WEIGHT);</span></span>
+<span id="L334"><span class="lineNum">     334</span> <span class="tlaGNC">           5 :     uint256 temp = (_supply * result) &gt;&gt; precision;</span></span>
+<span id="L335"><span class="lineNum">     335</span> <span class="tlaGNC">           5 :     return temp - _supply;</span></span>
 <span id="L336"><span class="lineNum">     336</span>              :   }</span>
 <span id="L337"><span class="lineNum">     337</span>              : </span>
 <span id="L338"><span class="lineNum">     338</span>              :   /**</span>
@@ -416,19 +416,19 @@
 <span id="L354"><span class="lineNum">     354</span>              :    *     Since we rely on unsigned-integer arithmetic and &quot;base &lt; 1&quot; ==&gt; &quot;log(base) &lt; 0&quot;, this function does not support &quot;_baseN &lt; _baseD&quot;.</span>
 <span id="L355"><span class="lineNum">     355</span>              :    */</span>
 <span id="L356"><span class="lineNum">     356</span>              :   function power(uint256 _baseN, uint256 _baseD, uint32 _expN, uint32 _expD) internal view returns (uint256, uint8) {</span>
-<span id="L357"><span class="lineNum">     357</span> <span class="tlaGNC">          14 :     require(_baseN &lt; MAX_NUM);</span></span>
+<span id="L357"><span class="lineNum">     357</span> <span class="tlaGNC">          22 :     require(_baseN &lt; MAX_NUM);</span></span>
 <span id="L358"><span class="lineNum">     358</span>              : </span>
-<span id="L359"><span class="lineNum">     359</span> <span class="tlaGNC">          14 :     uint256 baseLog;</span></span>
-<span id="L360"><span class="lineNum">     360</span> <span class="tlaGNC">          14 :     uint256 base = (_baseN * FIXED_1) / _baseD;</span></span>
-<span id="L361"><span class="lineNum">     361</span> <span class="tlaGNC">          14 :     if (base &lt; OPT_LOG_MAX_VAL) {</span></span>
-<span id="L362"><span class="lineNum">     362</span> <span class="tlaGNC">          14 :       baseLog = optimalLog(base);</span></span>
+<span id="L359"><span class="lineNum">     359</span> <span class="tlaGNC">          22 :     uint256 baseLog;</span></span>
+<span id="L360"><span class="lineNum">     360</span> <span class="tlaGNC">          22 :     uint256 base = (_baseN * FIXED_1) / _baseD;</span></span>
+<span id="L361"><span class="lineNum">     361</span> <span class="tlaGNC">          22 :     if (base &lt; OPT_LOG_MAX_VAL) {</span></span>
+<span id="L362"><span class="lineNum">     362</span> <span class="tlaGNC">          22 :       baseLog = optimalLog(base);</span></span>
 <span id="L363"><span class="lineNum">     363</span>              :     } else {</span>
 <span id="L364"><span class="lineNum">     364</span> <span class="tlaUNC tlaBgUNC">           0 :       baseLog = generalLog(base);</span></span>
 <span id="L365"><span class="lineNum">     365</span>              :     }</span>
 <span id="L366"><span class="lineNum">     366</span>              : </span>
-<span id="L367"><span class="lineNum">     367</span> <span class="tlaGNC tlaBgGNC">          14 :     uint256 baseLogTimesExp = (baseLog * _expN) / _expD;</span></span>
-<span id="L368"><span class="lineNum">     368</span> <span class="tlaGNC">          14 :     if (baseLogTimesExp &lt; OPT_EXP_MAX_VAL) {</span></span>
-<span id="L369"><span class="lineNum">     369</span> <span class="tlaGNC">          14 :       return (optimalExp(baseLogTimesExp), MAX_PRECISION);</span></span>
+<span id="L367"><span class="lineNum">     367</span> <span class="tlaGNC tlaBgGNC">          22 :     uint256 baseLogTimesExp = (baseLog * _expN) / _expD;</span></span>
+<span id="L368"><span class="lineNum">     368</span> <span class="tlaGNC">          22 :     if (baseLogTimesExp &lt; OPT_EXP_MAX_VAL) {</span></span>
+<span id="L369"><span class="lineNum">     369</span> <span class="tlaGNC">          22 :       return (optimalExp(baseLogTimesExp), MAX_PRECISION);</span></span>
 <span id="L370"><span class="lineNum">     370</span>              :     } else {</span>
 <span id="L371"><span class="lineNum">     371</span> <span class="tlaUNC tlaBgUNC">           0 :       uint8 precision = findPositionInMaxExpArray(baseLogTimesExp);</span></span>
 <span id="L372"><span class="lineNum">     372</span> <span class="tlaUNC">           0 :       return (generalExp(baseLogTimesExp &gt;&gt; (MAX_PRECISION - precision), precision), precision);</span></span>
@@ -600,64 +600,64 @@
 <span id="L538"><span class="lineNum">     538</span>              :    * - For example: log(250) = log(e^4 * e^1 * e^0.5 * 1.021692859) = 4 + 1 + 0.5 + log(1 + 0.021692859)</span>
 <span id="L539"><span class="lineNum">     539</span>              :    */</span>
 <span id="L540"><span class="lineNum">     540</span>              :   function optimalLog(uint256 x) internal pure returns (uint256) {</span>
-<span id="L541"><span class="lineNum">     541</span> <span class="tlaGNC tlaBgGNC">          14 :     uint256 res = 0;</span></span>
+<span id="L541"><span class="lineNum">     541</span> <span class="tlaGNC tlaBgGNC">          22 :     uint256 res = 0;</span></span>
 <span id="L542"><span class="lineNum">     542</span>              : </span>
-<span id="L543"><span class="lineNum">     543</span> <span class="tlaGNC">          14 :     uint256 y;</span></span>
-<span id="L544"><span class="lineNum">     544</span> <span class="tlaGNC">          14 :     uint256 z;</span></span>
-<span id="L545"><span class="lineNum">     545</span> <span class="tlaGNC">          14 :     uint256 w;</span></span>
+<span id="L543"><span class="lineNum">     543</span> <span class="tlaGNC">          22 :     uint256 y;</span></span>
+<span id="L544"><span class="lineNum">     544</span> <span class="tlaGNC">          22 :     uint256 z;</span></span>
+<span id="L545"><span class="lineNum">     545</span> <span class="tlaGNC">          22 :     uint256 w;</span></span>
 <span id="L546"><span class="lineNum">     546</span>              : </span>
-<span id="L547"><span class="lineNum">     547</span> <span class="tlaGNC">          14 :     if (x &gt;= 0xd3094c70f034de4b96ff7d5b6f99fcd8) {</span></span>
+<span id="L547"><span class="lineNum">     547</span> <span class="tlaGNC">          22 :     if (x &gt;= 0xd3094c70f034de4b96ff7d5b6f99fcd8) {</span></span>
 <span id="L548"><span class="lineNum">     548</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x40000000000000000000000000000000;</span></span>
 <span id="L549"><span class="lineNum">     549</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0xd3094c70f034de4b96ff7d5b6f99fcd8;</span></span>
 <span id="L550"><span class="lineNum">     550</span>              :     } // add 1 / 2^1</span>
-<span id="L551"><span class="lineNum">     551</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0xa45af1e1f40c333b3de1db4dd55f29a7) {</span></span>
+<span id="L551"><span class="lineNum">     551</span> <span class="tlaGNC tlaBgGNC">          22 :     if (x &gt;= 0xa45af1e1f40c333b3de1db4dd55f29a7) {</span></span>
 <span id="L552"><span class="lineNum">     552</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x20000000000000000000000000000000;</span></span>
 <span id="L553"><span class="lineNum">     553</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0xa45af1e1f40c333b3de1db4dd55f29a7;</span></span>
 <span id="L554"><span class="lineNum">     554</span>              :     } // add 1 / 2^2</span>
-<span id="L555"><span class="lineNum">     555</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0x910b022db7ae67ce76b441c27035c6a1) {</span></span>
+<span id="L555"><span class="lineNum">     555</span> <span class="tlaGNC tlaBgGNC">          22 :     if (x &gt;= 0x910b022db7ae67ce76b441c27035c6a1) {</span></span>
 <span id="L556"><span class="lineNum">     556</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x10000000000000000000000000000000;</span></span>
 <span id="L557"><span class="lineNum">     557</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0x910b022db7ae67ce76b441c27035c6a1;</span></span>
 <span id="L558"><span class="lineNum">     558</span>              :     } // add 1 / 2^3</span>
-<span id="L559"><span class="lineNum">     559</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0x88415abbe9a76bead8d00cf112e4d4a8) {</span></span>
+<span id="L559"><span class="lineNum">     559</span> <span class="tlaGNC tlaBgGNC">          22 :     if (x &gt;= 0x88415abbe9a76bead8d00cf112e4d4a8) {</span></span>
 <span id="L560"><span class="lineNum">     560</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x08000000000000000000000000000000;</span></span>
 <span id="L561"><span class="lineNum">     561</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0x88415abbe9a76bead8d00cf112e4d4a8;</span></span>
 <span id="L562"><span class="lineNum">     562</span>              :     } // add 1 / 2^4</span>
-<span id="L563"><span class="lineNum">     563</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0x84102b00893f64c705e841d5d4064bd3) {</span></span>
+<span id="L563"><span class="lineNum">     563</span> <span class="tlaGNC tlaBgGNC">          22 :     if (x &gt;= 0x84102b00893f64c705e841d5d4064bd3) {</span></span>
 <span id="L564"><span class="lineNum">     564</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x04000000000000000000000000000000;</span></span>
 <span id="L565"><span class="lineNum">     565</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0x84102b00893f64c705e841d5d4064bd3;</span></span>
 <span id="L566"><span class="lineNum">     566</span>              :     } // add 1 / 2^5</span>
-<span id="L567"><span class="lineNum">     567</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0x8204055aaef1c8bd5c3259f4822735a2) {</span></span>
-<span id="L568"><span class="lineNum">     568</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x02000000000000000000000000000000;</span></span>
-<span id="L569"><span class="lineNum">     569</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0x8204055aaef1c8bd5c3259f4822735a2;</span></span>
+<span id="L567"><span class="lineNum">     567</span> <span class="tlaGNC tlaBgGNC">          22 :     if (x &gt;= 0x8204055aaef1c8bd5c3259f4822735a2) {</span></span>
+<span id="L568"><span class="lineNum">     568</span> <span class="tlaGNC">           4 :       res += 0x02000000000000000000000000000000;</span></span>
+<span id="L569"><span class="lineNum">     569</span> <span class="tlaGNC">           4 :       x = (x * FIXED_1) / 0x8204055aaef1c8bd5c3259f4822735a2;</span></span>
 <span id="L570"><span class="lineNum">     570</span>              :     } // add 1 / 2^6</span>
-<span id="L571"><span class="lineNum">     571</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0x810100ab00222d861931c15e39b44e99) {</span></span>
+<span id="L571"><span class="lineNum">     571</span> <span class="tlaGNC">          22 :     if (x &gt;= 0x810100ab00222d861931c15e39b44e99) {</span></span>
 <span id="L572"><span class="lineNum">     572</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x01000000000000000000000000000000;</span></span>
 <span id="L573"><span class="lineNum">     573</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0x810100ab00222d861931c15e39b44e99;</span></span>
 <span id="L574"><span class="lineNum">     574</span>              :     } // add 1 / 2^7</span>
-<span id="L575"><span class="lineNum">     575</span> <span class="tlaGNC tlaBgGNC">          14 :     if (x &gt;= 0x808040155aabbbe9451521693554f733) {</span></span>
+<span id="L575"><span class="lineNum">     575</span> <span class="tlaGNC tlaBgGNC">          22 :     if (x &gt;= 0x808040155aabbbe9451521693554f733) {</span></span>
 <span id="L576"><span class="lineNum">     576</span> <span class="tlaUNC tlaBgUNC">           0 :       res += 0x00800000000000000000000000000000;</span></span>
 <span id="L577"><span class="lineNum">     577</span> <span class="tlaUNC">           0 :       x = (x * FIXED_1) / 0x808040155aabbbe9451521693554f733;</span></span>
 <span id="L578"><span class="lineNum">     578</span>              :     } // add 1 / 2^8</span>
 <span id="L579"><span class="lineNum">     579</span>              : </span>
-<span id="L580"><span class="lineNum">     580</span> <span class="tlaGNC tlaBgGNC">          14 :     z = y = x - FIXED_1;</span></span>
-<span id="L581"><span class="lineNum">     581</span> <span class="tlaGNC">          14 :     w = (y * y) / FIXED_1;</span></span>
-<span id="L582"><span class="lineNum">     582</span> <span class="tlaGNC">          14 :     res += (z * (0x100000000000000000000000000000000 - y)) / 0x100000000000000000000000000000000;</span></span>
-<span id="L583"><span class="lineNum">     583</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^01 / 01 - y^02 / 02</span></span>
-<span id="L584"><span class="lineNum">     584</span> <span class="tlaGNC">          14 :     res += (z * (0x0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - y)) / 0x200000000000000000000000000000000;</span></span>
-<span id="L585"><span class="lineNum">     585</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^03 / 03 - y^04 / 04</span></span>
-<span id="L586"><span class="lineNum">     586</span> <span class="tlaGNC">          14 :     res += (z * (0x099999999999999999999999999999999 - y)) / 0x300000000000000000000000000000000;</span></span>
-<span id="L587"><span class="lineNum">     587</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^05 / 05 - y^06 / 06</span></span>
-<span id="L588"><span class="lineNum">     588</span> <span class="tlaGNC">          14 :     res += (z * (0x092492492492492492492492492492492 - y)) / 0x400000000000000000000000000000000;</span></span>
-<span id="L589"><span class="lineNum">     589</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^07 / 07 - y^08 / 08</span></span>
-<span id="L590"><span class="lineNum">     590</span> <span class="tlaGNC">          14 :     res += (z * (0x08e38e38e38e38e38e38e38e38e38e38e - y)) / 0x500000000000000000000000000000000;</span></span>
-<span id="L591"><span class="lineNum">     591</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^09 / 09 - y^10 / 10</span></span>
-<span id="L592"><span class="lineNum">     592</span> <span class="tlaGNC">          14 :     res += (z * (0x08ba2e8ba2e8ba2e8ba2e8ba2e8ba2e8b - y)) / 0x600000000000000000000000000000000;</span></span>
-<span id="L593"><span class="lineNum">     593</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^11 / 11 - y^12 / 12</span></span>
-<span id="L594"><span class="lineNum">     594</span> <span class="tlaGNC">          14 :     res += (z * (0x089d89d89d89d89d89d89d89d89d89d89 - y)) / 0x700000000000000000000000000000000;</span></span>
-<span id="L595"><span class="lineNum">     595</span> <span class="tlaGNC">          14 :     z = (z * w) / FIXED_1; // add y^13 / 13 - y^14 / 14</span></span>
-<span id="L596"><span class="lineNum">     596</span> <span class="tlaGNC">          14 :     res += (z * (0x088888888888888888888888888888888 - y)) / 0x800000000000000000000000000000000; // add y^15 / 15 - y^16 / 16</span></span>
+<span id="L580"><span class="lineNum">     580</span> <span class="tlaGNC tlaBgGNC">          22 :     z = y = x - FIXED_1;</span></span>
+<span id="L581"><span class="lineNum">     581</span> <span class="tlaGNC">          22 :     w = (y * y) / FIXED_1;</span></span>
+<span id="L582"><span class="lineNum">     582</span> <span class="tlaGNC">          22 :     res += (z * (0x100000000000000000000000000000000 - y)) / 0x100000000000000000000000000000000;</span></span>
+<span id="L583"><span class="lineNum">     583</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^01 / 01 - y^02 / 02</span></span>
+<span id="L584"><span class="lineNum">     584</span> <span class="tlaGNC">          22 :     res += (z * (0x0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - y)) / 0x200000000000000000000000000000000;</span></span>
+<span id="L585"><span class="lineNum">     585</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^03 / 03 - y^04 / 04</span></span>
+<span id="L586"><span class="lineNum">     586</span> <span class="tlaGNC">          22 :     res += (z * (0x099999999999999999999999999999999 - y)) / 0x300000000000000000000000000000000;</span></span>
+<span id="L587"><span class="lineNum">     587</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^05 / 05 - y^06 / 06</span></span>
+<span id="L588"><span class="lineNum">     588</span> <span class="tlaGNC">          22 :     res += (z * (0x092492492492492492492492492492492 - y)) / 0x400000000000000000000000000000000;</span></span>
+<span id="L589"><span class="lineNum">     589</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^07 / 07 - y^08 / 08</span></span>
+<span id="L590"><span class="lineNum">     590</span> <span class="tlaGNC">          22 :     res += (z * (0x08e38e38e38e38e38e38e38e38e38e38e - y)) / 0x500000000000000000000000000000000;</span></span>
+<span id="L591"><span class="lineNum">     591</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^09 / 09 - y^10 / 10</span></span>
+<span id="L592"><span class="lineNum">     592</span> <span class="tlaGNC">          22 :     res += (z * (0x08ba2e8ba2e8ba2e8ba2e8ba2e8ba2e8b - y)) / 0x600000000000000000000000000000000;</span></span>
+<span id="L593"><span class="lineNum">     593</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^11 / 11 - y^12 / 12</span></span>
+<span id="L594"><span class="lineNum">     594</span> <span class="tlaGNC">          22 :     res += (z * (0x089d89d89d89d89d89d89d89d89d89d89 - y)) / 0x700000000000000000000000000000000;</span></span>
+<span id="L595"><span class="lineNum">     595</span> <span class="tlaGNC">          22 :     z = (z * w) / FIXED_1; // add y^13 / 13 - y^14 / 14</span></span>
+<span id="L596"><span class="lineNum">     596</span> <span class="tlaGNC">          22 :     res += (z * (0x088888888888888888888888888888888 - y)) / 0x800000000000000000000000000000000; // add y^15 / 15 - y^16 / 16</span></span>
 <span id="L597"><span class="lineNum">     597</span>              : </span>
-<span id="L598"><span class="lineNum">     598</span> <span class="tlaGNC">          14 :     return res;</span></span>
+<span id="L598"><span class="lineNum">     598</span> <span class="tlaGNC">          22 :     return res;</span></span>
 <span id="L599"><span class="lineNum">     599</span>              :   }</span>
 <span id="L600"><span class="lineNum">     600</span>              : </span>
 <span id="L601"><span class="lineNum">     601</span>              :   /**</span>
@@ -672,68 +672,68 @@
 <span id="L610"><span class="lineNum">     610</span>              :    * - For example: e^5.521692859 = e^(4 + 1 + 0.5 + 0.021692859) = e^4 * e^1 * e^0.5 * e^0.021692859</span>
 <span id="L611"><span class="lineNum">     611</span>              :    */</span>
 <span id="L612"><span class="lineNum">     612</span>              :   function optimalExp(uint256 x) internal pure returns (uint256) {</span>
-<span id="L613"><span class="lineNum">     613</span> <span class="tlaGNC">          14 :     uint256 res = 0;</span></span>
+<span id="L613"><span class="lineNum">     613</span> <span class="tlaGNC">          22 :     uint256 res = 0;</span></span>
 <span id="L614"><span class="lineNum">     614</span>              : </span>
-<span id="L615"><span class="lineNum">     615</span> <span class="tlaGNC">          14 :     uint256 y;</span></span>
-<span id="L616"><span class="lineNum">     616</span> <span class="tlaGNC">          14 :     uint256 z;</span></span>
+<span id="L615"><span class="lineNum">     615</span> <span class="tlaGNC">          22 :     uint256 y;</span></span>
+<span id="L616"><span class="lineNum">     616</span> <span class="tlaGNC">          22 :     uint256 z;</span></span>
 <span id="L617"><span class="lineNum">     617</span>              : </span>
-<span id="L618"><span class="lineNum">     618</span> <span class="tlaGNC">          14 :     z = y = x % 0x10000000000000000000000000000000; // get the input modulo 2^(-3)</span></span>
-<span id="L619"><span class="lineNum">     619</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L620"><span class="lineNum">     620</span> <span class="tlaGNC">          14 :     res += z * 0x10e1b3be415a0000; // add y^02 * (20! / 02!)</span></span>
-<span id="L621"><span class="lineNum">     621</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L622"><span class="lineNum">     622</span> <span class="tlaGNC">          14 :     res += z * 0x05a0913f6b1e0000; // add y^03 * (20! / 03!)</span></span>
-<span id="L623"><span class="lineNum">     623</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L624"><span class="lineNum">     624</span> <span class="tlaGNC">          14 :     res += z * 0x0168244fdac78000; // add y^04 * (20! / 04!)</span></span>
-<span id="L625"><span class="lineNum">     625</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L626"><span class="lineNum">     626</span> <span class="tlaGNC">          14 :     res += z * 0x004807432bc18000; // add y^05 * (20! / 05!)</span></span>
-<span id="L627"><span class="lineNum">     627</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L628"><span class="lineNum">     628</span> <span class="tlaGNC">          14 :     res += z * 0x000c0135dca04000; // add y^06 * (20! / 06!)</span></span>
-<span id="L629"><span class="lineNum">     629</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L630"><span class="lineNum">     630</span> <span class="tlaGNC">          14 :     res += z * 0x0001b707b1cdc000; // add y^07 * (20! / 07!)</span></span>
-<span id="L631"><span class="lineNum">     631</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L632"><span class="lineNum">     632</span> <span class="tlaGNC">          14 :     res += z * 0x000036e0f639b800; // add y^08 * (20! / 08!)</span></span>
-<span id="L633"><span class="lineNum">     633</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L634"><span class="lineNum">     634</span> <span class="tlaGNC">          14 :     res += z * 0x00000618fee9f800; // add y^09 * (20! / 09!)</span></span>
-<span id="L635"><span class="lineNum">     635</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L636"><span class="lineNum">     636</span> <span class="tlaGNC">          14 :     res += z * 0x0000009c197dcc00; // add y^10 * (20! / 10!)</span></span>
-<span id="L637"><span class="lineNum">     637</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L638"><span class="lineNum">     638</span> <span class="tlaGNC">          14 :     res += z * 0x0000000e30dce400; // add y^11 * (20! / 11!)</span></span>
-<span id="L639"><span class="lineNum">     639</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L640"><span class="lineNum">     640</span> <span class="tlaGNC">          14 :     res += z * 0x000000012ebd1300; // add y^12 * (20! / 12!)</span></span>
-<span id="L641"><span class="lineNum">     641</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L642"><span class="lineNum">     642</span> <span class="tlaGNC">          14 :     res += z * 0x0000000017499f00; // add y^13 * (20! / 13!)</span></span>
-<span id="L643"><span class="lineNum">     643</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L644"><span class="lineNum">     644</span> <span class="tlaGNC">          14 :     res += z * 0x0000000001a9d480; // add y^14 * (20! / 14!)</span></span>
-<span id="L645"><span class="lineNum">     645</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L646"><span class="lineNum">     646</span> <span class="tlaGNC">          14 :     res += z * 0x00000000001c6380; // add y^15 * (20! / 15!)</span></span>
-<span id="L647"><span class="lineNum">     647</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L648"><span class="lineNum">     648</span> <span class="tlaGNC">          14 :     res += z * 0x000000000001c638; // add y^16 * (20! / 16!)</span></span>
-<span id="L649"><span class="lineNum">     649</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L650"><span class="lineNum">     650</span> <span class="tlaGNC">          14 :     res += z * 0x0000000000001ab8; // add y^17 * (20! / 17!)</span></span>
-<span id="L651"><span class="lineNum">     651</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L652"><span class="lineNum">     652</span> <span class="tlaGNC">          14 :     res += z * 0x000000000000017c; // add y^18 * (20! / 18!)</span></span>
-<span id="L653"><span class="lineNum">     653</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L654"><span class="lineNum">     654</span> <span class="tlaGNC">          14 :     res += z * 0x0000000000000014; // add y^19 * (20! / 19!)</span></span>
-<span id="L655"><span class="lineNum">     655</span> <span class="tlaGNC">          14 :     z = (z * y) / FIXED_1;</span></span>
-<span id="L656"><span class="lineNum">     656</span> <span class="tlaGNC">          14 :     res += z * 0x0000000000000001; // add y^20 * (20! / 20!)</span></span>
-<span id="L657"><span class="lineNum">     657</span> <span class="tlaGNC">          14 :     res = res / 0x21c3677c82b40000 + y + FIXED_1; // divide by 20! and then add y^1 / 1! + y^0 / 0!</span></span>
+<span id="L618"><span class="lineNum">     618</span> <span class="tlaGNC">          22 :     z = y = x % 0x10000000000000000000000000000000; // get the input modulo 2^(-3)</span></span>
+<span id="L619"><span class="lineNum">     619</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L620"><span class="lineNum">     620</span> <span class="tlaGNC">          22 :     res += z * 0x10e1b3be415a0000; // add y^02 * (20! / 02!)</span></span>
+<span id="L621"><span class="lineNum">     621</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L622"><span class="lineNum">     622</span> <span class="tlaGNC">          22 :     res += z * 0x05a0913f6b1e0000; // add y^03 * (20! / 03!)</span></span>
+<span id="L623"><span class="lineNum">     623</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L624"><span class="lineNum">     624</span> <span class="tlaGNC">          22 :     res += z * 0x0168244fdac78000; // add y^04 * (20! / 04!)</span></span>
+<span id="L625"><span class="lineNum">     625</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L626"><span class="lineNum">     626</span> <span class="tlaGNC">          22 :     res += z * 0x004807432bc18000; // add y^05 * (20! / 05!)</span></span>
+<span id="L627"><span class="lineNum">     627</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L628"><span class="lineNum">     628</span> <span class="tlaGNC">          22 :     res += z * 0x000c0135dca04000; // add y^06 * (20! / 06!)</span></span>
+<span id="L629"><span class="lineNum">     629</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L630"><span class="lineNum">     630</span> <span class="tlaGNC">          22 :     res += z * 0x0001b707b1cdc000; // add y^07 * (20! / 07!)</span></span>
+<span id="L631"><span class="lineNum">     631</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L632"><span class="lineNum">     632</span> <span class="tlaGNC">          22 :     res += z * 0x000036e0f639b800; // add y^08 * (20! / 08!)</span></span>
+<span id="L633"><span class="lineNum">     633</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L634"><span class="lineNum">     634</span> <span class="tlaGNC">          22 :     res += z * 0x00000618fee9f800; // add y^09 * (20! / 09!)</span></span>
+<span id="L635"><span class="lineNum">     635</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L636"><span class="lineNum">     636</span> <span class="tlaGNC">          22 :     res += z * 0x0000009c197dcc00; // add y^10 * (20! / 10!)</span></span>
+<span id="L637"><span class="lineNum">     637</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L638"><span class="lineNum">     638</span> <span class="tlaGNC">          22 :     res += z * 0x0000000e30dce400; // add y^11 * (20! / 11!)</span></span>
+<span id="L639"><span class="lineNum">     639</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L640"><span class="lineNum">     640</span> <span class="tlaGNC">          22 :     res += z * 0x000000012ebd1300; // add y^12 * (20! / 12!)</span></span>
+<span id="L641"><span class="lineNum">     641</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L642"><span class="lineNum">     642</span> <span class="tlaGNC">          22 :     res += z * 0x0000000017499f00; // add y^13 * (20! / 13!)</span></span>
+<span id="L643"><span class="lineNum">     643</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L644"><span class="lineNum">     644</span> <span class="tlaGNC">          22 :     res += z * 0x0000000001a9d480; // add y^14 * (20! / 14!)</span></span>
+<span id="L645"><span class="lineNum">     645</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L646"><span class="lineNum">     646</span> <span class="tlaGNC">          22 :     res += z * 0x00000000001c6380; // add y^15 * (20! / 15!)</span></span>
+<span id="L647"><span class="lineNum">     647</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L648"><span class="lineNum">     648</span> <span class="tlaGNC">          22 :     res += z * 0x000000000001c638; // add y^16 * (20! / 16!)</span></span>
+<span id="L649"><span class="lineNum">     649</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L650"><span class="lineNum">     650</span> <span class="tlaGNC">          22 :     res += z * 0x0000000000001ab8; // add y^17 * (20! / 17!)</span></span>
+<span id="L651"><span class="lineNum">     651</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L652"><span class="lineNum">     652</span> <span class="tlaGNC">          22 :     res += z * 0x000000000000017c; // add y^18 * (20! / 18!)</span></span>
+<span id="L653"><span class="lineNum">     653</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L654"><span class="lineNum">     654</span> <span class="tlaGNC">          22 :     res += z * 0x0000000000000014; // add y^19 * (20! / 19!)</span></span>
+<span id="L655"><span class="lineNum">     655</span> <span class="tlaGNC">          22 :     z = (z * y) / FIXED_1;</span></span>
+<span id="L656"><span class="lineNum">     656</span> <span class="tlaGNC">          22 :     res += z * 0x0000000000000001; // add y^20 * (20! / 20!)</span></span>
+<span id="L657"><span class="lineNum">     657</span> <span class="tlaGNC">          22 :     res = res / 0x21c3677c82b40000 + y + FIXED_1; // divide by 20! and then add y^1 / 1! + y^0 / 0!</span></span>
 <span id="L658"><span class="lineNum">     658</span>              : </span>
-<span id="L659"><span class="lineNum">     659</span> <span class="tlaGNC">          14 :     if ((x &amp; 0x010000000000000000000000000000000) != 0)</span></span>
+<span id="L659"><span class="lineNum">     659</span> <span class="tlaGNC">          22 :     if ((x &amp; 0x010000000000000000000000000000000) != 0)</span></span>
 <span id="L660"><span class="lineNum">     660</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x1c3d6a24ed82218787d624d3e5eba95f9) / 0x18ebef9eac820ae8682b9793ac6d1e776; // multiply by e^2^(-3)</span></span>
-<span id="L661"><span class="lineNum">     661</span> <span class="tlaGNC tlaBgGNC">          14 :     if ((x &amp; 0x020000000000000000000000000000000) != 0)</span></span>
+<span id="L661"><span class="lineNum">     661</span> <span class="tlaGNC tlaBgGNC">          22 :     if ((x &amp; 0x020000000000000000000000000000000) != 0)</span></span>
 <span id="L662"><span class="lineNum">     662</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x18ebef9eac820ae8682b9793ac6d1e778) / 0x1368b2fc6f9609fe7aceb46aa619baed4; // multiply by e^2^(-2)</span></span>
-<span id="L663"><span class="lineNum">     663</span> <span class="tlaGNC tlaBgGNC">          14 :     if ((x &amp; 0x040000000000000000000000000000000) != 0)</span></span>
+<span id="L663"><span class="lineNum">     663</span> <span class="tlaGNC tlaBgGNC">          22 :     if ((x &amp; 0x040000000000000000000000000000000) != 0)</span></span>
 <span id="L664"><span class="lineNum">     664</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x1368b2fc6f9609fe7aceb46aa619baed5) / 0x0bc5ab1b16779be3575bd8f0520a9f21f; // multiply by e^2^(-1)</span></span>
-<span id="L665"><span class="lineNum">     665</span> <span class="tlaGNC tlaBgGNC">          14 :     if ((x &amp; 0x080000000000000000000000000000000) != 0)</span></span>
+<span id="L665"><span class="lineNum">     665</span> <span class="tlaGNC tlaBgGNC">          22 :     if ((x &amp; 0x080000000000000000000000000000000) != 0)</span></span>
 <span id="L666"><span class="lineNum">     666</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x0bc5ab1b16779be3575bd8f0520a9f21e) / 0x0454aaa8efe072e7f6ddbab84b40a55c9; // multiply by e^2^(+0)</span></span>
-<span id="L667"><span class="lineNum">     667</span> <span class="tlaGNC tlaBgGNC">          14 :     if ((x &amp; 0x100000000000000000000000000000000) != 0)</span></span>
+<span id="L667"><span class="lineNum">     667</span> <span class="tlaGNC tlaBgGNC">          22 :     if ((x &amp; 0x100000000000000000000000000000000) != 0)</span></span>
 <span id="L668"><span class="lineNum">     668</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x0454aaa8efe072e7f6ddbab84b40a55c5) / 0x00960aadc109e7a3bf4578099615711ea; // multiply by e^2^(+1)</span></span>
-<span id="L669"><span class="lineNum">     669</span> <span class="tlaGNC tlaBgGNC">          14 :     if ((x &amp; 0x200000000000000000000000000000000) != 0)</span></span>
+<span id="L669"><span class="lineNum">     669</span> <span class="tlaGNC tlaBgGNC">          22 :     if ((x &amp; 0x200000000000000000000000000000000) != 0)</span></span>
 <span id="L670"><span class="lineNum">     670</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x00960aadc109e7a3bf4578099615711d7) / 0x0002bf84208204f5977f9a8cf01fdce3d; // multiply by e^2^(+2)</span></span>
-<span id="L671"><span class="lineNum">     671</span> <span class="tlaGNC tlaBgGNC">          14 :     if ((x &amp; 0x400000000000000000000000000000000) != 0)</span></span>
+<span id="L671"><span class="lineNum">     671</span> <span class="tlaGNC tlaBgGNC">          22 :     if ((x &amp; 0x400000000000000000000000000000000) != 0)</span></span>
 <span id="L672"><span class="lineNum">     672</span> <span class="tlaUNC tlaBgUNC">           0 :       res = (res * 0x0002bf84208204f5977f9a8cf01fdc307) / 0x0000003c6ab775dd0b95b4cbee7e65d11; // multiply by e^2^(+3)</span></span>
 <span id="L673"><span class="lineNum">     673</span>              : </span>
-<span id="L674"><span class="lineNum">     674</span> <span class="tlaGNC tlaBgGNC">          14 :     return res;</span></span>
+<span id="L674"><span class="lineNum">     674</span> <span class="tlaGNC tlaBgGNC">          22 :     return res;</span></span>
 <span id="L675"><span class="lineNum">     675</span>              :   }</span>
 <span id="L676"><span class="lineNum">     676</span>              : }</span>
         </pre>
diff --git a/coverage_report/contracts/GoodDollarExchangeProvider.sol.func-c.html b/coverage_report/contracts/GoodDollarExchangeProvider.sol.func-c.html
index ca7637b..3ddd205 100644
--- a/coverage_report/contracts/GoodDollarExchangeProvider.sol.func-c.html
+++ b/coverage_report/contracts/GoodDollarExchangeProvider.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -70,44 +70,44 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L98">GoodDollarExchangeProvider.swapIn</a></td>
+              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L224">GoodDollarExchangeProvider.unpause</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L115">GoodDollarExchangeProvider.swapOut</a></td>
+              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L216">GoodDollarExchangeProvider.pause</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L224">GoodDollarExchangeProvider.unpause</a></td>
+              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L74">GoodDollarExchangeProvider.setAvatar</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L216">GoodDollarExchangeProvider.pause</a></td>
+              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L84">GoodDollarExchangeProvider.setExpansionController</a></td>
               
               <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L74">GoodDollarExchangeProvider.setAvatar</a></td>
+              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L98">GoodDollarExchangeProvider.swapIn</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L84">GoodDollarExchangeProvider.setExpansionController</a></td>
+              <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L115">GoodDollarExchangeProvider.swapOut</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
@@ -121,35 +121,35 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L166">GoodDollarExchangeProvider.mintFromInterest</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">8</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L133">GoodDollarExchangeProvider.mintFromExpansion</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L63">GoodDollarExchangeProvider.onlyExpansionController</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L34">GoodDollarExchangeProvider.</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">31</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L43">GoodDollarExchangeProvider.initialize</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">31</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/GoodDollarExchangeProvider.sol.func.html b/coverage_report/contracts/GoodDollarExchangeProvider.sol.func.html
index 0914bc6..f68594f 100644
--- a/coverage_report/contracts/GoodDollarExchangeProvider.sol.func.html
+++ b/coverage_report/contracts/GoodDollarExchangeProvider.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -65,28 +65,28 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L34">GoodDollarExchangeProvider.</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">31</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L43">GoodDollarExchangeProvider.initialize</a></td>
               
-              <td class="coverFnHi">25</td>
+              <td class="coverFnHi">31</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L133">GoodDollarExchangeProvider.mintFromExpansion</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L166">GoodDollarExchangeProvider.mintFromInterest</a></td>
               
-              <td class="coverFnHi">7</td>
+              <td class="coverFnHi">8</td>
               
               
             </tr>
@@ -100,7 +100,7 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L63">GoodDollarExchangeProvider.onlyExpansionController</a></td>
               
-              <td class="coverFnHi">8</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
@@ -128,14 +128,14 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L98">GoodDollarExchangeProvider.swapIn</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExchangeProvider.sol.gcov.html#L115">GoodDollarExchangeProvider.swapOut</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/GoodDollarExchangeProvider.sol.gcov.html b/coverage_report/contracts/GoodDollarExchangeProvider.sol.gcov.html
index 7fdce5a..acad0fd 100644
--- a/coverage_report/contracts/GoodDollarExchangeProvider.sol.gcov.html
+++ b/coverage_report/contracts/GoodDollarExchangeProvider.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -110,11 +110,11 @@
 <span id="L48"><span class="lineNum">      48</span>              :     address _expansionController,</span>
 <span id="L49"><span class="lineNum">      49</span>              :     address _avatar</span>
 <span id="L50"><span class="lineNum">      50</span>              :   ) public initializer {</span>
-<span id="L51"><span class="lineNum">      51</span> <span class="tlaGNC tlaBgGNC">          25 :     BancorExchangeProvider._initialize(_broker, _reserve);</span></span>
-<span id="L52"><span class="lineNum">      52</span> <span class="tlaGNC">          25 :     __Pausable_init();</span></span>
+<span id="L51"><span class="lineNum">      51</span> <span class="tlaGNC tlaBgGNC">          31 :     BancorExchangeProvider._initialize(_broker, _reserve);</span></span>
+<span id="L52"><span class="lineNum">      52</span> <span class="tlaGNC">          31 :     __Pausable_init();</span></span>
 <span id="L53"><span class="lineNum">      53</span>              : </span>
-<span id="L54"><span class="lineNum">      54</span> <span class="tlaGNC">          25 :     setExpansionController(_expansionController);</span></span>
-<span id="L55"><span class="lineNum">      55</span> <span class="tlaGNC">          25 :     setAvatar(_avatar);</span></span>
+<span id="L54"><span class="lineNum">      54</span> <span class="tlaGNC">          31 :     setExpansionController(_expansionController);</span></span>
+<span id="L55"><span class="lineNum">      55</span> <span class="tlaGNC">          31 :     setAvatar(_avatar);</span></span>
 <span id="L56"><span class="lineNum">      56</span>              :   }</span>
 <span id="L57"><span class="lineNum">      57</span>              : </span>
 <span id="L58"><span class="lineNum">      58</span>              :   /* ==================== Modifiers ==================== */</span>
@@ -125,7 +125,7 @@
 <span id="L63"><span class="lineNum">      63</span>              :   }</span>
 <span id="L64"><span class="lineNum">      64</span>              : </span>
 <span id="L65"><span class="lineNum">      65</span>              :   modifier onlyExpansionController() {</span>
-<span id="L66"><span class="lineNum">      66</span> <span class="tlaGNC">           8 :     require(msg.sender == address(expansionController), &quot;Only ExpansionController can call this function&quot;);</span></span>
+<span id="L66"><span class="lineNum">      66</span> <span class="tlaGNC">           9 :     require(msg.sender == address(expansionController), &quot;Only ExpansionController can call this function&quot;);</span></span>
 <span id="L67"><span class="lineNum">      67</span>              :     _;</span>
 <span id="L68"><span class="lineNum">      68</span>              :   }</span>
 <span id="L69"><span class="lineNum">      69</span>              : </span>
@@ -136,9 +136,9 @@
 <span id="L74"><span class="lineNum">      74</span>              :    * @param _avatar The address of the DAO contract.</span>
 <span id="L75"><span class="lineNum">      75</span>              :    */</span>
 <span id="L76"><span class="lineNum">      76</span>              :   function setAvatar(address _avatar) public onlyOwner {</span>
-<span id="L77"><span class="lineNum">      77</span> <span class="tlaGNC">          27 :     require(_avatar != address(0), &quot;Avatar address must be set&quot;);</span></span>
-<span id="L78"><span class="lineNum">      78</span> <span class="tlaGNC">          26 :     AVATAR = _avatar;</span></span>
-<span id="L79"><span class="lineNum">      79</span> <span class="tlaGNC">          26 :     emit AvatarUpdated(_avatar);</span></span>
+<span id="L77"><span class="lineNum">      77</span> <span class="tlaGNC">          33 :     require(_avatar != address(0), &quot;Avatar address must be set&quot;);</span></span>
+<span id="L78"><span class="lineNum">      78</span> <span class="tlaGNC">          32 :     AVATAR = _avatar;</span></span>
+<span id="L79"><span class="lineNum">      79</span> <span class="tlaGNC">          32 :     emit AvatarUpdated(_avatar);</span></span>
 <span id="L80"><span class="lineNum">      80</span>              :   }</span>
 <span id="L81"><span class="lineNum">      81</span>              : </span>
 <span id="L82"><span class="lineNum">      82</span>              :   /**</span>
@@ -146,9 +146,9 @@
 <span id="L84"><span class="lineNum">      84</span>              :    * @param _expansionController The address of the Expansion Controller contract.</span>
 <span id="L85"><span class="lineNum">      85</span>              :    */</span>
 <span id="L86"><span class="lineNum">      86</span>              :   function setExpansionController(address _expansionController) public onlyOwner {</span>
-<span id="L87"><span class="lineNum">      87</span> <span class="tlaGNC">          27 :     require(_expansionController != address(0), &quot;ExpansionController address must be set&quot;);</span></span>
-<span id="L88"><span class="lineNum">      88</span> <span class="tlaGNC">          26 :     expansionController = IGoodDollarExpansionController(_expansionController);</span></span>
-<span id="L89"><span class="lineNum">      89</span> <span class="tlaGNC">          26 :     emit ExpansionControllerUpdated(_expansionController);</span></span>
+<span id="L87"><span class="lineNum">      87</span> <span class="tlaGNC">          33 :     require(_expansionController != address(0), &quot;ExpansionController address must be set&quot;);</span></span>
+<span id="L88"><span class="lineNum">      88</span> <span class="tlaGNC">          32 :     expansionController = IGoodDollarExpansionController(_expansionController);</span></span>
+<span id="L89"><span class="lineNum">      89</span> <span class="tlaGNC">          32 :     emit ExpansionControllerUpdated(_expansionController);</span></span>
 <span id="L90"><span class="lineNum">      90</span>              :   }</span>
 <span id="L91"><span class="lineNum">      91</span>              : </span>
 <span id="L92"><span class="lineNum">      92</span>              :   /**</span>
@@ -165,7 +165,7 @@
 <span id="L103"><span class="lineNum">     103</span>              :     address tokenOut,</span>
 <span id="L104"><span class="lineNum">     104</span>              :     uint256 amountIn</span>
 <span id="L105"><span class="lineNum">     105</span>              :   ) public override onlyBroker whenNotPaused returns (uint256 amountOut) {</span>
-<span id="L106"><span class="lineNum">     106</span> <span class="tlaGNC">           1 :     amountOut = BancorExchangeProvider.swapIn(exchangeId, tokenIn, tokenOut, amountIn);</span></span>
+<span id="L106"><span class="lineNum">     106</span> <span class="tlaGNC">           3 :     amountOut = BancorExchangeProvider.swapIn(exchangeId, tokenIn, tokenOut, amountIn);</span></span>
 <span id="L107"><span class="lineNum">     107</span>              :   }</span>
 <span id="L108"><span class="lineNum">     108</span>              : </span>
 <span id="L109"><span class="lineNum">     109</span>              :   /**</span>
@@ -182,7 +182,7 @@
 <span id="L120"><span class="lineNum">     120</span>              :     address tokenOut,</span>
 <span id="L121"><span class="lineNum">     121</span>              :     uint256 amountOut</span>
 <span id="L122"><span class="lineNum">     122</span>              :   ) public override onlyBroker whenNotPaused returns (uint256 amountIn) {</span>
-<span id="L123"><span class="lineNum">     123</span> <span class="tlaGNC">           1 :     amountIn = BancorExchangeProvider.swapOut(exchangeId, tokenIn, tokenOut, amountOut);</span></span>
+<span id="L123"><span class="lineNum">     123</span> <span class="tlaGNC">           3 :     amountIn = BancorExchangeProvider.swapOut(exchangeId, tokenIn, tokenOut, amountOut);</span></span>
 <span id="L124"><span class="lineNum">     124</span>              :   }</span>
 <span id="L125"><span class="lineNum">     125</span>              : </span>
 <span id="L126"><span class="lineNum">     126</span>              :   /**</span>
@@ -198,24 +198,24 @@
 <span id="L136"><span class="lineNum">     136</span>              :     bytes32 exchangeId,</span>
 <span id="L137"><span class="lineNum">     137</span>              :     uint256 expansionScaler</span>
 <span id="L138"><span class="lineNum">     138</span>              :   ) external onlyExpansionController whenNotPaused returns (uint256 amountToMint) {</span>
-<span id="L139"><span class="lineNum">     139</span> <span class="tlaGNC">           6 :     require(expansionScaler &gt; 0, &quot;Expansion rate must be greater than 0&quot;);</span></span>
-<span id="L140"><span class="lineNum">     140</span> <span class="tlaGNC">           5 :     PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L139"><span class="lineNum">     139</span> <span class="tlaGNC">           7 :     require(expansionScaler &gt; 0, &quot;Expansion rate must be greater than 0&quot;);</span></span>
+<span id="L140"><span class="lineNum">     140</span> <span class="tlaGNC">           6 :     PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
 <span id="L141"><span class="lineNum">     141</span>              : </span>
-<span id="L142"><span class="lineNum">     142</span> <span class="tlaGNC">           4 :     UD60x18 scaledRatio = wrap(uint256(exchange.reserveRatio) * 1e10);</span></span>
-<span id="L143"><span class="lineNum">     143</span> <span class="tlaGNC">           4 :     UD60x18 newRatio = scaledRatio.mul(wrap(expansionScaler));</span></span>
+<span id="L142"><span class="lineNum">     142</span> <span class="tlaGNC">           5 :     UD60x18 scaledRatio = wrap(uint256(exchange.reserveRatio) * 1e10);</span></span>
+<span id="L143"><span class="lineNum">     143</span> <span class="tlaGNC">           5 :     UD60x18 newRatio = scaledRatio.mul(wrap(expansionScaler));</span></span>
 <span id="L144"><span class="lineNum">     144</span>              : </span>
-<span id="L145"><span class="lineNum">     145</span> <span class="tlaGNC">           4 :     UD60x18 numerator = wrap(exchange.tokenSupply).mul(scaledRatio);</span></span>
-<span id="L146"><span class="lineNum">     146</span> <span class="tlaGNC">           4 :     numerator = numerator.sub(wrap(exchange.tokenSupply).mul(newRatio));</span></span>
+<span id="L145"><span class="lineNum">     145</span> <span class="tlaGNC">           5 :     UD60x18 numerator = wrap(exchange.tokenSupply).mul(scaledRatio);</span></span>
+<span id="L146"><span class="lineNum">     146</span> <span class="tlaGNC">           5 :     numerator = numerator.sub(wrap(exchange.tokenSupply).mul(newRatio));</span></span>
 <span id="L147"><span class="lineNum">     147</span>              : </span>
-<span id="L148"><span class="lineNum">     148</span> <span class="tlaGNC">           4 :     uint256 scaledAmountToMint = unwrap(numerator.div(newRatio));</span></span>
-<span id="L149"><span class="lineNum">     149</span> <span class="tlaGNC">           4 :     uint32 newRatioUint = uint32(unwrap(newRatio) / 1e10);</span></span>
+<span id="L148"><span class="lineNum">     148</span> <span class="tlaGNC">           5 :     uint256 scaledAmountToMint = unwrap(numerator.div(newRatio));</span></span>
+<span id="L149"><span class="lineNum">     149</span> <span class="tlaGNC">           5 :     uint32 newRatioUint = uint32(unwrap(newRatio) / 1e10);</span></span>
 <span id="L150"><span class="lineNum">     150</span>              : </span>
-<span id="L151"><span class="lineNum">     151</span> <span class="tlaGNC">           4 :     exchanges[exchangeId].reserveRatio = newRatioUint;</span></span>
-<span id="L152"><span class="lineNum">     152</span> <span class="tlaGNC">           4 :     exchanges[exchangeId].tokenSupply += scaledAmountToMint;</span></span>
+<span id="L151"><span class="lineNum">     151</span> <span class="tlaGNC">           5 :     exchanges[exchangeId].reserveRatio = newRatioUint;</span></span>
+<span id="L152"><span class="lineNum">     152</span> <span class="tlaGNC">           5 :     exchanges[exchangeId].tokenSupply += scaledAmountToMint;</span></span>
 <span id="L153"><span class="lineNum">     153</span>              : </span>
-<span id="L154"><span class="lineNum">     154</span> <span class="tlaGNC">           4 :     amountToMint = scaledAmountToMint / tokenPrecisionMultipliers[exchange.tokenAddress];</span></span>
-<span id="L155"><span class="lineNum">     155</span> <span class="tlaGNC">           4 :     emit ReserveRatioUpdated(exchangeId, newRatioUint);</span></span>
-<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">           4 :     return amountToMint;</span></span>
+<span id="L154"><span class="lineNum">     154</span> <span class="tlaGNC">           5 :     amountToMint = scaledAmountToMint / tokenPrecisionMultipliers[exchange.tokenAddress];</span></span>
+<span id="L155"><span class="lineNum">     155</span> <span class="tlaGNC">           5 :     emit ReserveRatioUpdated(exchangeId, newRatioUint);</span></span>
+<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">           5 :     return amountToMint;</span></span>
 <span id="L157"><span class="lineNum">     157</span>              :   }</span>
 <span id="L158"><span class="lineNum">     158</span>              : </span>
 <span id="L159"><span class="lineNum">     159</span>              :   /**</span>
@@ -231,18 +231,18 @@
 <span id="L169"><span class="lineNum">     169</span>              :     bytes32 exchangeId,</span>
 <span id="L170"><span class="lineNum">     170</span>              :     uint256 reserveInterest</span>
 <span id="L171"><span class="lineNum">     171</span>              :   ) external onlyExpansionController whenNotPaused returns (uint256 amountToMint) {</span>
-<span id="L172"><span class="lineNum">     172</span> <span class="tlaGNC">           5 :     PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
+<span id="L172"><span class="lineNum">     172</span> <span class="tlaGNC">           6 :     PoolExchange memory exchange = getPoolExchange(exchangeId);</span></span>
 <span id="L173"><span class="lineNum">     173</span>              : </span>
-<span id="L174"><span class="lineNum">     174</span> <span class="tlaGNC">           4 :     uint256 reserveinterestScaled = reserveInterest * tokenPrecisionMultipliers[exchange.reserveAsset];</span></span>
-<span id="L175"><span class="lineNum">     175</span> <span class="tlaGNC">           4 :     uint256 amountToMintScaled = unwrap(</span></span>
+<span id="L174"><span class="lineNum">     174</span> <span class="tlaGNC">           5 :     uint256 reserveinterestScaled = reserveInterest * tokenPrecisionMultipliers[exchange.reserveAsset];</span></span>
+<span id="L175"><span class="lineNum">     175</span> <span class="tlaGNC">           5 :     uint256 amountToMintScaled = unwrap(</span></span>
 <span id="L176"><span class="lineNum">     176</span>              :       wrap(reserveinterestScaled).mul(wrap(exchange.tokenSupply)).div(wrap(exchange.reserveBalance))</span>
 <span id="L177"><span class="lineNum">     177</span>              :     );</span>
-<span id="L178"><span class="lineNum">     178</span> <span class="tlaGNC">           4 :     amountToMint = amountToMintScaled / tokenPrecisionMultipliers[exchange.tokenAddress];</span></span>
+<span id="L178"><span class="lineNum">     178</span> <span class="tlaGNC">           5 :     amountToMint = amountToMintScaled / tokenPrecisionMultipliers[exchange.tokenAddress];</span></span>
 <span id="L179"><span class="lineNum">     179</span>              : </span>
-<span id="L180"><span class="lineNum">     180</span> <span class="tlaGNC">           4 :     exchanges[exchangeId].tokenSupply += amountToMintScaled;</span></span>
-<span id="L181"><span class="lineNum">     181</span> <span class="tlaGNC">           4 :     exchanges[exchangeId].reserveBalance += reserveinterestScaled;</span></span>
+<span id="L180"><span class="lineNum">     180</span> <span class="tlaGNC">           5 :     exchanges[exchangeId].tokenSupply += amountToMintScaled;</span></span>
+<span id="L181"><span class="lineNum">     181</span> <span class="tlaGNC">           5 :     exchanges[exchangeId].reserveBalance += reserveinterestScaled;</span></span>
 <span id="L182"><span class="lineNum">     182</span>              : </span>
-<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">           4 :     return amountToMint;</span></span>
+<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">           5 :     return amountToMint;</span></span>
 <span id="L184"><span class="lineNum">     184</span>              :   }</span>
 <span id="L185"><span class="lineNum">     185</span>              : </span>
 <span id="L186"><span class="lineNum">     186</span>              :   /**</span>
diff --git a/coverage_report/contracts/GoodDollarExpansionController.sol.func-c.html b/coverage_report/contracts/GoodDollarExpansionController.sol.func-c.html
index 0f897a4..093ab65 100644
--- a/coverage_report/contracts/GoodDollarExpansionController.sol.func-c.html
+++ b/coverage_report/contracts/GoodDollarExpansionController.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -63,16 +63,16 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L192">GoodDollarExpansionController.mintUBIFromInterest</a></td>
+              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L227">GoodDollarExpansionController.mintUBIFromReserveBalance</a></td>
               
               <td class="coverFnHi">2</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L227">GoodDollarExpansionController.mintUBIFromReserveBalance</a></td>
+              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L192">GoodDollarExpansionController.mintUBIFromInterest</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
@@ -119,14 +119,14 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L258">GoodDollarExpansionController.mintUBIFromExpansion</a></td>
+              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L95">GoodDollarExpansionController.getExpansionConfig</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L95">GoodDollarExpansionController.getExpansionConfig</a></td>
+              <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L258">GoodDollarExpansionController.mintUBIFromExpansion</a></td>
               
               <td class="coverFnHi">10</td>
               
@@ -135,21 +135,21 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L165">GoodDollarExpansionController.setExpansionConfig</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">26</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L53">GoodDollarExpansionController.</a></td>
               
-              <td class="coverFnHi">34</td>
+              <td class="coverFnHi">40</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L66">GoodDollarExpansionController.initialize</a></td>
               
-              <td class="coverFnHi">34</td>
+              <td class="coverFnHi">40</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/GoodDollarExpansionController.sol.func.html b/coverage_report/contracts/GoodDollarExpansionController.sol.func.html
index b93b9f3..fea0aa9 100644
--- a/coverage_report/contracts/GoodDollarExpansionController.sol.func.html
+++ b/coverage_report/contracts/GoodDollarExpansionController.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -65,7 +65,7 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L53">GoodDollarExpansionController.</a></td>
               
-              <td class="coverFnHi">34</td>
+              <td class="coverFnHi">40</td>
               
               
             </tr>
@@ -79,7 +79,7 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L66">GoodDollarExpansionController.initialize</a></td>
               
-              <td class="coverFnHi">34</td>
+              <td class="coverFnHi">40</td>
               
               
             </tr>
@@ -93,14 +93,14 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L258">GoodDollarExpansionController.mintUBIFromExpansion</a></td>
               
-              <td class="coverFnHi">9</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L192">GoodDollarExpansionController.mintUBIFromInterest</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
@@ -135,7 +135,7 @@
             <tr>
               <td class="coverFn"><a href="GoodDollarExpansionController.sol.gcov.html#L165">GoodDollarExpansionController.setExpansionConfig</a></td>
               
-              <td class="coverFnHi">20</td>
+              <td class="coverFnHi">26</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/GoodDollarExpansionController.sol.gcov.html b/coverage_report/contracts/GoodDollarExpansionController.sol.gcov.html
index ab83374..2963aff 100644
--- a/coverage_report/contracts/GoodDollarExpansionController.sol.gcov.html
+++ b/coverage_report/contracts/GoodDollarExpansionController.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -133,13 +133,13 @@
 <span id="L71"><span class="lineNum">      71</span>              :         address _reserve,</span>
 <span id="L72"><span class="lineNum">      72</span>              :         address _avatar</span>
 <span id="L73"><span class="lineNum">      73</span>              :     ) public initializer {</span>
-<span id="L74"><span class="lineNum">      74</span> <span class="tlaGNC tlaBgGNC">          34 :         __Pausable_init();</span></span>
-<span id="L75"><span class="lineNum">      75</span> <span class="tlaGNC">          34 :         __Ownable_init();</span></span>
+<span id="L74"><span class="lineNum">      74</span> <span class="tlaGNC tlaBgGNC">          40 :         __Pausable_init();</span></span>
+<span id="L75"><span class="lineNum">      75</span> <span class="tlaGNC">          40 :         __Ownable_init();</span></span>
 <span id="L76"><span class="lineNum">      76</span>              : </span>
-<span id="L77"><span class="lineNum">      77</span> <span class="tlaGNC">          34 :         setGoodDollarExchangeProvider(_goodDollarExchangeProvider);</span></span>
-<span id="L78"><span class="lineNum">      78</span> <span class="tlaGNC">          34 :         setDistributionHelper(_distributionHelper);</span></span>
-<span id="L79"><span class="lineNum">      79</span> <span class="tlaGNC">          34 :         setReserve(_reserve);</span></span>
-<span id="L80"><span class="lineNum">      80</span> <span class="tlaGNC">          34 :         setAvatar(_avatar);</span></span>
+<span id="L77"><span class="lineNum">      77</span> <span class="tlaGNC">          40 :         setGoodDollarExchangeProvider(_goodDollarExchangeProvider);</span></span>
+<span id="L78"><span class="lineNum">      78</span> <span class="tlaGNC">          40 :         setDistributionHelper(_distributionHelper);</span></span>
+<span id="L79"><span class="lineNum">      79</span> <span class="tlaGNC">          40 :         setReserve(_reserve);</span></span>
+<span id="L80"><span class="lineNum">      80</span> <span class="tlaGNC">          40 :         setAvatar(_avatar);</span></span>
 <span id="L81"><span class="lineNum">      81</span>              :     }</span>
 <span id="L82"><span class="lineNum">      82</span>              : </span>
 <span id="L83"><span class="lineNum">      83</span>              :     /* ==================== Modifiers ==================== */</span>
@@ -159,11 +159,11 @@
 <span id="L97"><span class="lineNum">      97</span>              :     function getExpansionConfig(</span>
 <span id="L98"><span class="lineNum">      98</span>              :         bytes32 exchangeId</span>
 <span id="L99"><span class="lineNum">      99</span>              :     ) public view returns (ExchangeExpansionConfig memory) {</span>
-<span id="L100"><span class="lineNum">     100</span> <span class="tlaGNC">          19 :         require(</span></span>
+<span id="L100"><span class="lineNum">     100</span> <span class="tlaGNC">          20 :         require(</span></span>
 <span id="L101"><span class="lineNum">     101</span>              :             exchangeExpansionConfigs[exchangeId].expansionRate &gt; 0,</span>
 <span id="L102"><span class="lineNum">     102</span>              :             &quot;Expansion config not set&quot;</span>
 <span id="L103"><span class="lineNum">     103</span>              :         );</span>
-<span id="L104"><span class="lineNum">     104</span> <span class="tlaGNC">          17 :         return exchangeExpansionConfigs[exchangeId];</span></span>
+<span id="L104"><span class="lineNum">     104</span> <span class="tlaGNC">          18 :         return exchangeExpansionConfigs[exchangeId];</span></span>
 <span id="L105"><span class="lineNum">     105</span>              :     }</span>
 <span id="L106"><span class="lineNum">     106</span>              : </span>
 <span id="L107"><span class="lineNum">     107</span>              :     /* ==================== Mutative Functions ==================== */</span>
@@ -175,14 +175,14 @@
 <span id="L113"><span class="lineNum">     113</span>              :     function setGoodDollarExchangeProvider(</span>
 <span id="L114"><span class="lineNum">     114</span>              :         address _goodDollarExchangeProvider</span>
 <span id="L115"><span class="lineNum">     115</span>              :     ) public onlyOwner {</span>
-<span id="L116"><span class="lineNum">     116</span> <span class="tlaGNC">          36 :         require(</span></span>
+<span id="L116"><span class="lineNum">     116</span> <span class="tlaGNC">          42 :         require(</span></span>
 <span id="L117"><span class="lineNum">     117</span>              :             _goodDollarExchangeProvider != address(0),</span>
 <span id="L118"><span class="lineNum">     118</span>              :             &quot;GoodDollarExchangeProvider address must be set&quot;</span>
 <span id="L119"><span class="lineNum">     119</span>              :         );</span>
-<span id="L120"><span class="lineNum">     120</span> <span class="tlaGNC">          35 :         goodDollarExchangeProvider = IGoodDollarExchangeProvider(</span></span>
+<span id="L120"><span class="lineNum">     120</span> <span class="tlaGNC">          41 :         goodDollarExchangeProvider = IGoodDollarExchangeProvider(</span></span>
 <span id="L121"><span class="lineNum">     121</span>              :             _goodDollarExchangeProvider</span>
 <span id="L122"><span class="lineNum">     122</span>              :         );</span>
-<span id="L123"><span class="lineNum">     123</span> <span class="tlaGNC">          35 :         emit GoodDollarExchangeProviderUpdated(_goodDollarExchangeProvider);</span></span>
+<span id="L123"><span class="lineNum">     123</span> <span class="tlaGNC">          41 :         emit GoodDollarExchangeProviderUpdated(_goodDollarExchangeProvider);</span></span>
 <span id="L124"><span class="lineNum">     124</span>              :     }</span>
 <span id="L125"><span class="lineNum">     125</span>              : </span>
 <span id="L126"><span class="lineNum">     126</span>              :     /**</span>
@@ -192,12 +192,12 @@
 <span id="L130"><span class="lineNum">     130</span>              :     function setDistributionHelper(</span>
 <span id="L131"><span class="lineNum">     131</span>              :         address _distributionHelper</span>
 <span id="L132"><span class="lineNum">     132</span>              :     ) public onlyOwner {</span>
-<span id="L133"><span class="lineNum">     133</span> <span class="tlaGNC">          36 :         require(</span></span>
+<span id="L133"><span class="lineNum">     133</span> <span class="tlaGNC">          42 :         require(</span></span>
 <span id="L134"><span class="lineNum">     134</span>              :             _distributionHelper != address(0),</span>
 <span id="L135"><span class="lineNum">     135</span>              :             &quot;DistributionHelper address must be set&quot;</span>
 <span id="L136"><span class="lineNum">     136</span>              :         );</span>
-<span id="L137"><span class="lineNum">     137</span> <span class="tlaGNC">          35 :         distributionHelper = IDistributionHelper(_distributionHelper);</span></span>
-<span id="L138"><span class="lineNum">     138</span> <span class="tlaGNC">          35 :         emit DistributionHelperUpdated(_distributionHelper);</span></span>
+<span id="L137"><span class="lineNum">     137</span> <span class="tlaGNC">          41 :         distributionHelper = IDistributionHelper(_distributionHelper);</span></span>
+<span id="L138"><span class="lineNum">     138</span> <span class="tlaGNC">          41 :         emit DistributionHelperUpdated(_distributionHelper);</span></span>
 <span id="L139"><span class="lineNum">     139</span>              :     }</span>
 <span id="L140"><span class="lineNum">     140</span>              : </span>
 <span id="L141"><span class="lineNum">     141</span>              :     /**</span>
@@ -205,9 +205,9 @@
 <span id="L143"><span class="lineNum">     143</span>              :      * @param _reserve The address of the reserve contract.</span>
 <span id="L144"><span class="lineNum">     144</span>              :      */</span>
 <span id="L145"><span class="lineNum">     145</span>              :     function setReserve(address _reserve) public onlyOwner {</span>
-<span id="L146"><span class="lineNum">     146</span> <span class="tlaGNC">          36 :         require(_reserve != address(0), &quot;Reserve address must be set&quot;);</span></span>
-<span id="L147"><span class="lineNum">     147</span> <span class="tlaGNC">          35 :         reserve = _reserve;</span></span>
-<span id="L148"><span class="lineNum">     148</span> <span class="tlaGNC">          35 :         emit ReserveUpdated(_reserve);</span></span>
+<span id="L146"><span class="lineNum">     146</span> <span class="tlaGNC">          42 :         require(_reserve != address(0), &quot;Reserve address must be set&quot;);</span></span>
+<span id="L147"><span class="lineNum">     147</span> <span class="tlaGNC">          41 :         reserve = _reserve;</span></span>
+<span id="L148"><span class="lineNum">     148</span> <span class="tlaGNC">          41 :         emit ReserveUpdated(_reserve);</span></span>
 <span id="L149"><span class="lineNum">     149</span>              :     }</span>
 <span id="L150"><span class="lineNum">     150</span>              : </span>
 <span id="L151"><span class="lineNum">     151</span>              :     /**</span>
@@ -215,9 +215,9 @@
 <span id="L153"><span class="lineNum">     153</span>              :      * @param _avatar The address of the AVATAR contract.</span>
 <span id="L154"><span class="lineNum">     154</span>              :      */</span>
 <span id="L155"><span class="lineNum">     155</span>              :     function setAvatar(address _avatar) public onlyOwner {</span>
-<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">          36 :         require(_avatar != address(0), &quot;Avatar address must be set&quot;);</span></span>
-<span id="L157"><span class="lineNum">     157</span> <span class="tlaGNC">          35 :         AVATAR = _avatar;</span></span>
-<span id="L158"><span class="lineNum">     158</span> <span class="tlaGNC">          35 :         emit AvatarUpdated(_avatar);</span></span>
+<span id="L156"><span class="lineNum">     156</span> <span class="tlaGNC">          42 :         require(_avatar != address(0), &quot;Avatar address must be set&quot;);</span></span>
+<span id="L157"><span class="lineNum">     157</span> <span class="tlaGNC">          41 :         AVATAR = _avatar;</span></span>
+<span id="L158"><span class="lineNum">     158</span> <span class="tlaGNC">          41 :         emit AvatarUpdated(_avatar);</span></span>
 <span id="L159"><span class="lineNum">     159</span>              :     }</span>
 <span id="L160"><span class="lineNum">     160</span>              : </span>
 <span id="L161"><span class="lineNum">     161</span>              :     /**</span>
@@ -231,21 +231,21 @@
 <span id="L169"><span class="lineNum">     169</span>              :         uint64 expansionRate,</span>
 <span id="L170"><span class="lineNum">     170</span>              :         uint32 expansionFrequency</span>
 <span id="L171"><span class="lineNum">     171</span>              :     ) external onlyAvatar {</span>
-<span id="L172"><span class="lineNum">     172</span> <span class="tlaGNC">          19 :         require(</span></span>
+<span id="L172"><span class="lineNum">     172</span> <span class="tlaGNC">          25 :         require(</span></span>
 <span id="L173"><span class="lineNum">     173</span>              :             expansionRate &lt; MAX_WEIGHT,</span>
 <span id="L174"><span class="lineNum">     174</span>              :             &quot;Expansion rate must be less than 100%&quot;</span>
 <span id="L175"><span class="lineNum">     175</span>              :         );</span>
-<span id="L176"><span class="lineNum">     176</span> <span class="tlaGNC">          18 :         require(expansionRate &gt; 0, &quot;Expansion rate must be greater than 0&quot;);</span></span>
-<span id="L177"><span class="lineNum">     177</span> <span class="tlaGNC">          17 :         require(</span></span>
+<span id="L176"><span class="lineNum">     176</span> <span class="tlaGNC">          24 :         require(expansionRate &gt; 0, &quot;Expansion rate must be greater than 0&quot;);</span></span>
+<span id="L177"><span class="lineNum">     177</span> <span class="tlaGNC">          23 :         require(</span></span>
 <span id="L178"><span class="lineNum">     178</span>              :             expansionFrequency &gt; 0,</span>
 <span id="L179"><span class="lineNum">     179</span>              :             &quot;Expansion frequency must be greater than 0&quot;</span>
 <span id="L180"><span class="lineNum">     180</span>              :         );</span>
 <span id="L181"><span class="lineNum">     181</span>              : </span>
-<span id="L182"><span class="lineNum">     182</span> <span class="tlaGNC">          16 :         exchangeExpansionConfigs[exchangeId].expansionRate = expansionRate;</span></span>
-<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">          16 :         exchangeExpansionConfigs[exchangeId]</span></span>
+<span id="L182"><span class="lineNum">     182</span> <span class="tlaGNC">          22 :         exchangeExpansionConfigs[exchangeId].expansionRate = expansionRate;</span></span>
+<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">          22 :         exchangeExpansionConfigs[exchangeId]</span></span>
 <span id="L184"><span class="lineNum">     184</span>              :             .expansionFrequency = expansionFrequency;</span>
 <span id="L185"><span class="lineNum">     185</span>              : </span>
-<span id="L186"><span class="lineNum">     186</span> <span class="tlaGNC">          16 :         emit ExpansionConfigSet(exchangeId, expansionRate, expansionFrequency);</span></span>
+<span id="L186"><span class="lineNum">     186</span> <span class="tlaGNC">          22 :         emit ExpansionConfigSet(exchangeId, expansionRate, expansionFrequency);</span></span>
 <span id="L187"><span class="lineNum">     187</span>              :     }</span>
 <span id="L188"><span class="lineNum">     188</span>              : </span>
 <span id="L189"><span class="lineNum">     189</span>              :     /**</span>
@@ -257,18 +257,18 @@
 <span id="L195"><span class="lineNum">     195</span>              :         bytes32 exchangeId,</span>
 <span id="L196"><span class="lineNum">     196</span>              :         uint256 reserveInterest</span>
 <span id="L197"><span class="lineNum">     197</span>              :     ) external {</span>
-<span id="L198"><span class="lineNum">     198</span> <span class="tlaGNC">           2 :         require(reserveInterest &gt; 0, &quot;reserveInterest must be greater than 0&quot;);</span></span>
-<span id="L199"><span class="lineNum">     199</span> <span class="tlaGNC">           1 :         IBancorExchangeProvider.PoolExchange</span></span>
-<span id="L200"><span class="lineNum">     200</span> <span class="tlaGNC">           1 :             memory exchange = IBancorExchangeProvider(</span></span>
+<span id="L198"><span class="lineNum">     198</span> <span class="tlaGNC">           3 :         require(reserveInterest &gt; 0, &quot;reserveInterest must be greater than 0&quot;);</span></span>
+<span id="L199"><span class="lineNum">     199</span> <span class="tlaGNC">           2 :         IBancorExchangeProvider.PoolExchange</span></span>
+<span id="L200"><span class="lineNum">     200</span> <span class="tlaGNC">           2 :             memory exchange = IBancorExchangeProvider(</span></span>
 <span id="L201"><span class="lineNum">     201</span>              :                 address(goodDollarExchangeProvider)</span>
 <span id="L202"><span class="lineNum">     202</span>              :             ).getPoolExchange(exchangeId);</span>
 <span id="L203"><span class="lineNum">     203</span>              : </span>
-<span id="L204"><span class="lineNum">     204</span> <span class="tlaGNC">           1 :         uint256 amountToMint = goodDollarExchangeProvider.mintFromInterest(</span></span>
+<span id="L204"><span class="lineNum">     204</span> <span class="tlaGNC">           2 :         uint256 amountToMint = goodDollarExchangeProvider.mintFromInterest(</span></span>
 <span id="L205"><span class="lineNum">     205</span>              :             exchangeId,</span>
 <span id="L206"><span class="lineNum">     206</span>              :             reserveInterest</span>
 <span id="L207"><span class="lineNum">     207</span>              :         );</span>
 <span id="L208"><span class="lineNum">     208</span>              : </span>
-<span id="L209"><span class="lineNum">     209</span> <span class="tlaGNC">           1 :         require(</span></span>
+<span id="L209"><span class="lineNum">     209</span> <span class="tlaGNC">           2 :         require(</span></span>
 <span id="L210"><span class="lineNum">     210</span>              :             IERC20(exchange.reserveAsset).transferFrom(</span>
 <span id="L211"><span class="lineNum">     211</span>              :                 msg.sender,</span>
 <span id="L212"><span class="lineNum">     212</span>              :                 reserve,</span>
@@ -276,11 +276,11 @@
 <span id="L214"><span class="lineNum">     214</span>              :             ),</span>
 <span id="L215"><span class="lineNum">     215</span>              :             &quot;Transfer failed&quot;</span>
 <span id="L216"><span class="lineNum">     216</span>              :         );</span>
-<span id="L217"><span class="lineNum">     217</span> <span class="tlaGNC">           1 :         IGoodDollar(exchange.tokenAddress).mint(</span></span>
+<span id="L217"><span class="lineNum">     217</span> <span class="tlaGNC">           2 :         IGoodDollar(exchange.tokenAddress).mint(</span></span>
 <span id="L218"><span class="lineNum">     218</span>              :             address(distributionHelper),</span>
 <span id="L219"><span class="lineNum">     219</span>              :             amountToMint</span>
 <span id="L220"><span class="lineNum">     220</span>              :         );</span>
-<span id="L221"><span class="lineNum">     221</span> <span class="tlaGNC">           1 :         emit InterestUBIMinted(exchangeId, amountToMint);</span></span>
+<span id="L221"><span class="lineNum">     221</span> <span class="tlaGNC">           2 :         emit InterestUBIMinted(exchangeId, amountToMint);</span></span>
 <span id="L222"><span class="lineNum">     222</span>              :     }</span>
 <span id="L223"><span class="lineNum">     223</span>              : </span>
 <span id="L224"><span class="lineNum">     224</span>              :     /**</span>
@@ -322,45 +322,45 @@
 <span id="L260"><span class="lineNum">     260</span>              :     function mintUBIFromExpansion(</span>
 <span id="L261"><span class="lineNum">     261</span>              :         bytes32 exchangeId</span>
 <span id="L262"><span class="lineNum">     262</span>              :     ) external returns (uint256 amountMinted) {</span>
-<span id="L263"><span class="lineNum">     263</span> <span class="tlaGNC">           9 :         ExchangeExpansionConfig memory config = getExpansionConfig(exchangeId);</span></span>
-<span id="L264"><span class="lineNum">     264</span> <span class="tlaGNC">           8 :         IBancorExchangeProvider.PoolExchange</span></span>
-<span id="L265"><span class="lineNum">     265</span> <span class="tlaGNC">           8 :             memory exchange = IBancorExchangeProvider(</span></span>
+<span id="L263"><span class="lineNum">     263</span> <span class="tlaGNC">          10 :         ExchangeExpansionConfig memory config = getExpansionConfig(exchangeId);</span></span>
+<span id="L264"><span class="lineNum">     264</span> <span class="tlaGNC">           9 :         IBancorExchangeProvider.PoolExchange</span></span>
+<span id="L265"><span class="lineNum">     265</span> <span class="tlaGNC">           9 :             memory exchange = IBancorExchangeProvider(</span></span>
 <span id="L266"><span class="lineNum">     266</span>              :                 address(goodDollarExchangeProvider)</span>
 <span id="L267"><span class="lineNum">     267</span>              :             ).getPoolExchange(exchangeId);</span>
 <span id="L268"><span class="lineNum">     268</span>              : </span>
-<span id="L269"><span class="lineNum">     269</span> <span class="tlaGNC">           8 :         bool shouldExpand = block.timestamp &gt;</span></span>
-<span id="L270"><span class="lineNum">     270</span> <span class="tlaGNC">           8 :             config.lastExpansion + config.expansionFrequency;</span></span>
-<span id="L271"><span class="lineNum">     271</span> <span class="tlaGNC">           8 :         if (shouldExpand || config.lastExpansion == 0) {</span></span>
-<span id="L272"><span class="lineNum">     272</span> <span class="tlaGNC">           7 :             uint256 numberOfExpansions;</span></span>
+<span id="L269"><span class="lineNum">     269</span> <span class="tlaGNC">           9 :         bool shouldExpand = block.timestamp &gt;</span></span>
+<span id="L270"><span class="lineNum">     270</span> <span class="tlaGNC">           9 :             config.lastExpansion + config.expansionFrequency;</span></span>
+<span id="L271"><span class="lineNum">     271</span> <span class="tlaGNC">           9 :         if (shouldExpand || config.lastExpansion == 0) {</span></span>
+<span id="L272"><span class="lineNum">     272</span> <span class="tlaGNC">           8 :             uint256 numberOfExpansions;</span></span>
 <span id="L273"><span class="lineNum">     273</span>              : </span>
 <span id="L274"><span class="lineNum">     274</span>              :             //special case for first expansion</span>
-<span id="L275"><span class="lineNum">     275</span> <span class="tlaGNC">           7 :             if (config.lastExpansion == 0) {</span></span>
-<span id="L276"><span class="lineNum">     276</span> <span class="tlaGNC">           5 :                 numberOfExpansions = 1;</span></span>
+<span id="L275"><span class="lineNum">     275</span> <span class="tlaGNC">           8 :             if (config.lastExpansion == 0) {</span></span>
+<span id="L276"><span class="lineNum">     276</span> <span class="tlaGNC">           6 :                 numberOfExpansions = 1;</span></span>
 <span id="L277"><span class="lineNum">     277</span>              :             } else {</span>
 <span id="L278"><span class="lineNum">     278</span> <span class="tlaGNC">           2 :                 numberOfExpansions =</span></span>
 <span id="L279"><span class="lineNum">     279</span>              :                     (block.timestamp - config.lastExpansion) /</span>
 <span id="L280"><span class="lineNum">     280</span>              :                     config.expansionFrequency;</span>
 <span id="L281"><span class="lineNum">     281</span>              :             }</span>
 <span id="L282"><span class="lineNum">     282</span>              : </span>
-<span id="L283"><span class="lineNum">     283</span> <span class="tlaGNC">           7 :             uint256 stepExpansionScaler = MAX_WEIGHT - config.expansionRate;</span></span>
-<span id="L284"><span class="lineNum">     284</span> <span class="tlaGNC">           7 :             uint256 expansionScaler = unwrap(</span></span>
+<span id="L283"><span class="lineNum">     283</span> <span class="tlaGNC">           8 :             uint256 stepExpansionScaler = MAX_WEIGHT - config.expansionRate;</span></span>
+<span id="L284"><span class="lineNum">     284</span> <span class="tlaGNC">           8 :             uint256 expansionScaler = unwrap(</span></span>
 <span id="L285"><span class="lineNum">     285</span>              :                 powu(wrap(stepExpansionScaler), numberOfExpansions)</span>
 <span id="L286"><span class="lineNum">     286</span>              :             );</span>
 <span id="L287"><span class="lineNum">     287</span>              : </span>
-<span id="L288"><span class="lineNum">     288</span> <span class="tlaGNC">           7 :             exchangeExpansionConfigs[exchangeId].lastExpansion = uint32(</span></span>
+<span id="L288"><span class="lineNum">     288</span> <span class="tlaGNC">           8 :             exchangeExpansionConfigs[exchangeId].lastExpansion = uint32(</span></span>
 <span id="L289"><span class="lineNum">     289</span>              :                 block.timestamp</span>
 <span id="L290"><span class="lineNum">     290</span>              :             );</span>
-<span id="L291"><span class="lineNum">     291</span> <span class="tlaGNC">           7 :             amountMinted = goodDollarExchangeProvider.mintFromExpansion(</span></span>
+<span id="L291"><span class="lineNum">     291</span> <span class="tlaGNC">           8 :             amountMinted = goodDollarExchangeProvider.mintFromExpansion(</span></span>
 <span id="L292"><span class="lineNum">     292</span>              :                 exchangeId,</span>
 <span id="L293"><span class="lineNum">     293</span>              :                 expansionScaler</span>
 <span id="L294"><span class="lineNum">     294</span>              :             );</span>
 <span id="L295"><span class="lineNum">     295</span>              : </span>
-<span id="L296"><span class="lineNum">     296</span> <span class="tlaGNC">           7 :             IGoodDollar(exchange.tokenAddress).mint(</span></span>
+<span id="L296"><span class="lineNum">     296</span> <span class="tlaGNC">           8 :             IGoodDollar(exchange.tokenAddress).mint(</span></span>
 <span id="L297"><span class="lineNum">     297</span>              :                 address(distributionHelper),</span>
 <span id="L298"><span class="lineNum">     298</span>              :                 amountMinted</span>
 <span id="L299"><span class="lineNum">     299</span>              :             );</span>
-<span id="L300"><span class="lineNum">     300</span> <span class="tlaGNC">           7 :             distributionHelper.onDistribution(amountMinted);</span></span>
-<span id="L301"><span class="lineNum">     301</span> <span class="tlaGNC">           7 :             emit ExpansionUBIMinted(exchangeId, amountMinted);</span></span>
+<span id="L300"><span class="lineNum">     300</span> <span class="tlaGNC">           8 :             distributionHelper.onDistribution(amountMinted);</span></span>
+<span id="L301"><span class="lineNum">     301</span> <span class="tlaGNC">           8 :             emit ExpansionUBIMinted(exchangeId, amountMinted);</span></span>
 <span id="L302"><span class="lineNum">     302</span>              :         }</span>
 <span id="L303"><span class="lineNum">     303</span>              :     }</span>
 <span id="L304"><span class="lineNum">     304</span>              : </span>
diff --git a/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func-c.html b/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func-c.html
index 27eba3e..7cc7c51 100644
--- a/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func-c.html
+++ b/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -65,28 +65,28 @@
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L24">SafeERC20MintableBurnable.safeBurn</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L20">SafeERC20MintableBurnable.safeMint</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L16">SafeERC20MintableBurnable.safeTransferFrom</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L34">SafeERC20MintableBurnable._callOptionalReturn</a></td>
               
-              <td class="coverFnHi">12</td>
+              <td class="coverFnHi">20</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func.html b/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func.html
index 3f7ae2f..4524c34 100644
--- a/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func.html
+++ b/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -65,28 +65,28 @@
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L34">SafeERC20MintableBurnable._callOptionalReturn</a></td>
               
-              <td class="coverFnHi">12</td>
+              <td class="coverFnHi">20</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L24">SafeERC20MintableBurnable.safeBurn</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L20">SafeERC20MintableBurnable.safeMint</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="SafeERC20MintableBurnable.sol.gcov.html#L16">SafeERC20MintableBurnable.safeTransferFrom</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.gcov.html b/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.gcov.html
index f3d6b18..ca155ad 100644
--- a/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.gcov.html
+++ b/coverage_report/contracts/common/SafeERC20MintableBurnable.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -78,15 +78,15 @@
 <span id="L16"><span class="lineNum">      16</span>              :   using Address for address;</span>
 <span id="L17"><span class="lineNum">      17</span>              : </span>
 <span id="L18"><span class="lineNum">      18</span>              :   function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal {</span>
-<span id="L19"><span class="lineNum">      19</span> <span class="tlaGNC tlaBgGNC">           6 :     _callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value));</span></span>
+<span id="L19"><span class="lineNum">      19</span> <span class="tlaGNC tlaBgGNC">          10 :     _callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value));</span></span>
 <span id="L20"><span class="lineNum">      20</span>              :   }</span>
 <span id="L21"><span class="lineNum">      21</span>              : </span>
 <span id="L22"><span class="lineNum">      22</span>              :   function safeMint(IERC20 token, address account, uint256 amount) internal {</span>
-<span id="L23"><span class="lineNum">      23</span> <span class="tlaGNC">           3 :     _callOptionalReturn(token, abi.encodeWithSelector(token.mint.selector, account, amount));</span></span>
+<span id="L23"><span class="lineNum">      23</span> <span class="tlaGNC">           5 :     _callOptionalReturn(token, abi.encodeWithSelector(token.mint.selector, account, amount));</span></span>
 <span id="L24"><span class="lineNum">      24</span>              :   }</span>
 <span id="L25"><span class="lineNum">      25</span>              : </span>
 <span id="L26"><span class="lineNum">      26</span>              :   function safeBurn(IERC20 token, uint256 amount) internal {</span>
-<span id="L27"><span class="lineNum">      27</span> <span class="tlaGNC">           3 :     _callOptionalReturn(token, abi.encodeWithSelector(token.burn.selector, amount));</span></span>
+<span id="L27"><span class="lineNum">      27</span> <span class="tlaGNC">           5 :     _callOptionalReturn(token, abi.encodeWithSelector(token.burn.selector, amount));</span></span>
 <span id="L28"><span class="lineNum">      28</span>              :   }</span>
 <span id="L29"><span class="lineNum">      29</span>              : </span>
 <span id="L30"><span class="lineNum">      30</span>              :   /**</span>
@@ -100,10 +100,10 @@
 <span id="L38"><span class="lineNum">      38</span>              :     // we're implementing it ourselves. We use {Address-functionCall} to perform this call, which verifies that</span>
 <span id="L39"><span class="lineNum">      39</span>              :     // the target address contains contract code and also asserts for success in the low-level call.</span>
 <span id="L40"><span class="lineNum">      40</span>              : </span>
-<span id="L41"><span class="lineNum">      41</span> <span class="tlaGNC">          12 :     bytes memory returndata = address(token).functionCall(data, &quot;SafeERC20: low-level call failed&quot;);</span></span>
-<span id="L42"><span class="lineNum">      42</span> <span class="tlaGNC">          12 :     if (returndata.length &gt; 0) {</span></span>
+<span id="L41"><span class="lineNum">      41</span> <span class="tlaGNC">          20 :     bytes memory returndata = address(token).functionCall(data, &quot;SafeERC20: low-level call failed&quot;);</span></span>
+<span id="L42"><span class="lineNum">      42</span> <span class="tlaGNC">          20 :     if (returndata.length &gt; 0) {</span></span>
 <span id="L43"><span class="lineNum">      43</span>              :       // Return data is optional</span>
-<span id="L44"><span class="lineNum">      44</span> <span class="tlaGNC">          12 :       require(abi.decode(returndata, (bool)), &quot;SafeERC20: ERC20 operation did not succeed&quot;);</span></span>
+<span id="L44"><span class="lineNum">      44</span> <span class="tlaGNC">          18 :       require(abi.decode(returndata, (bool)), &quot;SafeERC20: ERC20 operation did not succeed&quot;);</span></span>
 <span id="L45"><span class="lineNum">      45</span>              :     }</span>
 <span id="L46"><span class="lineNum">      46</span>              :   }</span>
 <span id="L47"><span class="lineNum">      47</span>              : }</span>
diff --git a/coverage_report/contracts/common/UsingRegistry.sol.func-c.html b/coverage_report/contracts/common/UsingRegistry.sol.func-c.html
new file mode 100644
index 0000000..bb7b22d
--- /dev/null
+++ b/coverage_report/contracts/common/UsingRegistry.sol.func-c.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info - contracts/common/UsingRegistry.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory contracts/common">contracts/common</a> - UsingRegistry.sol<span style="font-size: 80%;"> (<a href="UsingRegistry.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">27.3&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="UsingRegistry.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L58">UsingRegistry.getExchange</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L62">UsingRegistry.getFreezer</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L66">UsingRegistry.getGoldToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L70">UsingRegistry.getReserve</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L74">UsingRegistry.getSortedOracles</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L78">UsingRegistry.getStableToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L38">UsingRegistry.onlyRegisteredContract</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L43">UsingRegistry.onlyRegisteredContracts</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L52">UsingRegistry.setRegistry</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/coverage_report/contracts/common/UsingRegistry.sol.func.html b/coverage_report/contracts/common/UsingRegistry.sol.func.html
new file mode 100644
index 0000000..92ec904
--- /dev/null
+++ b/coverage_report/contracts/common/UsingRegistry.sol.func.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info - contracts/common/UsingRegistry.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory contracts/common">contracts/common</a> - UsingRegistry.sol<span style="font-size: 80%;"> (<a href="UsingRegistry.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">27.3&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="UsingRegistry.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L58">UsingRegistry.getExchange</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L62">UsingRegistry.getFreezer</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L66">UsingRegistry.getGoldToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L70">UsingRegistry.getReserve</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L74">UsingRegistry.getSortedOracles</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L78">UsingRegistry.getStableToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L38">UsingRegistry.onlyRegisteredContract</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L43">UsingRegistry.onlyRegisteredContracts</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="UsingRegistry.sol.gcov.html#L52">UsingRegistry.setRegistry</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/coverage_report/contracts/common/UsingRegistry.sol.gcov.html b/coverage_report/contracts/common/UsingRegistry.sol.gcov.html
new file mode 100644
index 0000000..0756447
--- /dev/null
+++ b/coverage_report/contracts/common/UsingRegistry.sol.gcov.html
@@ -0,0 +1,159 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info - contracts/common/UsingRegistry.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory contracts/common">contracts/common</a> - UsingRegistry.sol<span style="font-size: 80%;"> (source / <a href="UsingRegistry.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">27.3&nbsp;%</td>
+            <td class="headerCovTableEntry">11</td>
+            <td class="headerCovTableEntry">3</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">0.0&nbsp;%</td>
+            <td class="headerCovTableEntry">9</td>
+            <td class="headerCovTableEntry">0</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <table cellpadding=0 cellspacing=0 border=0>
+            <tr>
+              <td><br></td>
+            </tr>
+            <tr>
+              <td>
+<pre class="sourceHeading">            Line data    Source code</pre>
+<pre class="source">
+<span id="L1"><span class="lineNum">       1</span>              : // SPDX-License-Identifier: GPL-3.0-or-later</span>
+<span id="L2"><span class="lineNum">       2</span>              : pragma solidity ^0.5.13;</span>
+<span id="L3"><span class="lineNum">       3</span>              : </span>
+<span id="L4"><span class="lineNum">       4</span>              : import &quot;openzeppelin-solidity/contracts/ownership/Ownable.sol&quot;;</span>
+<span id="L5"><span class="lineNum">       5</span>              : import &quot;openzeppelin-solidity/contracts/token/ERC20/IERC20.sol&quot;;</span>
+<span id="L6"><span class="lineNum">       6</span>              : </span>
+<span id="L7"><span class="lineNum">       7</span>              : import &quot;celo/contracts/common/interfaces/IFreezer.sol&quot;;</span>
+<span id="L8"><span class="lineNum">       8</span>              : import &quot;celo/contracts/common/interfaces/IRegistry.sol&quot;;</span>
+<span id="L9"><span class="lineNum">       9</span>              : </span>
+<span id="L10"><span class="lineNum">      10</span>              : import &quot;../interfaces/IExchange.sol&quot;;</span>
+<span id="L11"><span class="lineNum">      11</span>              : import &quot;../interfaces/IStableTokenV2.sol&quot;;</span>
+<span id="L12"><span class="lineNum">      12</span>              : import &quot;../interfaces/IReserve.sol&quot;;</span>
+<span id="L13"><span class="lineNum">      13</span>              : import &quot;../interfaces/ISortedOracles.sol&quot;;</span>
+<span id="L14"><span class="lineNum">      14</span>              : </span>
+<span id="L15"><span class="lineNum">      15</span>              : contract UsingRegistry is Ownable {</span>
+<span id="L16"><span class="lineNum">      16</span>              :   event RegistrySet(address indexed registryAddress);</span>
+<span id="L17"><span class="lineNum">      17</span>              : </span>
+<span id="L18"><span class="lineNum">      18</span>              :   // solhint-disable state-visibility</span>
+<span id="L19"><span class="lineNum">      19</span>              :   bytes32 constant ACCOUNTS_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Accounts&quot;));</span>
+<span id="L20"><span class="lineNum">      20</span>              :   bytes32 constant ATTESTATIONS_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Attestations&quot;));</span>
+<span id="L21"><span class="lineNum">      21</span>              :   bytes32 constant DOWNTIME_SLASHER_REGISTRY_ID = keccak256(abi.encodePacked(&quot;DowntimeSlasher&quot;));</span>
+<span id="L22"><span class="lineNum">      22</span>              :   bytes32 constant DOUBLE_SIGNING_SLASHER_REGISTRY_ID = keccak256(abi.encodePacked(&quot;DoubleSigningSlasher&quot;));</span>
+<span id="L23"><span class="lineNum">      23</span>              :   bytes32 constant ELECTION_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Election&quot;));</span>
+<span id="L24"><span class="lineNum">      24</span>              :   bytes32 constant EXCHANGE_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Exchange&quot;));</span>
+<span id="L25"><span class="lineNum">      25</span>              :   bytes32 constant FEE_CURRENCY_WHITELIST_REGISTRY_ID = keccak256(abi.encodePacked(&quot;FeeCurrencyWhitelist&quot;));</span>
+<span id="L26"><span class="lineNum">      26</span>              :   bytes32 constant FREEZER_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Freezer&quot;));</span>
+<span id="L27"><span class="lineNum">      27</span>              :   bytes32 constant GOLD_TOKEN_REGISTRY_ID = keccak256(abi.encodePacked(&quot;GoldToken&quot;));</span>
+<span id="L28"><span class="lineNum">      28</span>              :   bytes32 constant GOVERNANCE_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Governance&quot;));</span>
+<span id="L29"><span class="lineNum">      29</span>              :   bytes32 constant GOVERNANCE_SLASHER_REGISTRY_ID = keccak256(abi.encodePacked(&quot;GovernanceSlasher&quot;));</span>
+<span id="L30"><span class="lineNum">      30</span>              :   bytes32 constant LOCKED_GOLD_REGISTRY_ID = keccak256(abi.encodePacked(&quot;LockedGold&quot;));</span>
+<span id="L31"><span class="lineNum">      31</span>              :   bytes32 constant RESERVE_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Reserve&quot;));</span>
+<span id="L32"><span class="lineNum">      32</span>              :   bytes32 constant RANDOM_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Random&quot;));</span>
+<span id="L33"><span class="lineNum">      33</span>              :   bytes32 constant SORTED_ORACLES_REGISTRY_ID = keccak256(abi.encodePacked(&quot;SortedOracles&quot;));</span>
+<span id="L34"><span class="lineNum">      34</span>              :   bytes32 constant STABLE_TOKEN_REGISTRY_ID = keccak256(abi.encodePacked(&quot;StableToken&quot;));</span>
+<span id="L35"><span class="lineNum">      35</span>              :   bytes32 constant VALIDATORS_REGISTRY_ID = keccak256(abi.encodePacked(&quot;Validators&quot;));</span>
+<span id="L36"><span class="lineNum">      36</span>              :   // solhint-enable state-visibility</span>
+<span id="L37"><span class="lineNum">      37</span>              : </span>
+<span id="L38"><span class="lineNum">      38</span>              :   IRegistry public registry;</span>
+<span id="L39"><span class="lineNum">      39</span>              : </span>
+<span id="L40"><span class="lineNum">      40</span>              :   modifier onlyRegisteredContract(bytes32 identifierHash) {</span>
+<span id="L41"><span class="lineNum">      41</span> <span class="tlaUNC tlaBgUNC">           0 :     require(registry.getAddressForOrDie(identifierHash) == msg.sender, &quot;only registered contract&quot;);</span></span>
+<span id="L42"><span class="lineNum">      42</span>              :     _;</span>
+<span id="L43"><span class="lineNum">      43</span>              :   }</span>
+<span id="L44"><span class="lineNum">      44</span>              : </span>
+<span id="L45"><span class="lineNum">      45</span>              :   modifier onlyRegisteredContracts(bytes32[] memory identifierHashes) {</span>
+<span id="L46"><span class="lineNum">      46</span> <span class="tlaUNC">           0 :     require(registry.isOneOf(identifierHashes, msg.sender), &quot;only registered contracts&quot;);</span></span>
+<span id="L47"><span class="lineNum">      47</span>              :     _;</span>
+<span id="L48"><span class="lineNum">      48</span>              :   }</span>
+<span id="L49"><span class="lineNum">      49</span>              : </span>
+<span id="L50"><span class="lineNum">      50</span>              :   /**</span>
+<span id="L51"><span class="lineNum">      51</span>              :    * @notice Updates the address pointing to a Registry contract.</span>
+<span id="L52"><span class="lineNum">      52</span>              :    * @param registryAddress The address of a registry contract for routing to other contracts.</span>
+<span id="L53"><span class="lineNum">      53</span>              :    */</span>
+<span id="L54"><span class="lineNum">      54</span>              :   function setRegistry(address registryAddress) public onlyOwner {</span>
+<span id="L55"><span class="lineNum">      55</span> <span class="tlaGNC tlaBgGNC">           6 :     require(registryAddress != address(0), &quot;Cannot register the null address&quot;);</span></span>
+<span id="L56"><span class="lineNum">      56</span> <span class="tlaGNC">           6 :     registry = IRegistry(registryAddress);</span></span>
+<span id="L57"><span class="lineNum">      57</span> <span class="tlaGNC">           6 :     emit RegistrySet(registryAddress);</span></span>
+<span id="L58"><span class="lineNum">      58</span>              :   }</span>
+<span id="L59"><span class="lineNum">      59</span>              : </span>
+<span id="L60"><span class="lineNum">      60</span>              :   function getExchange() internal view returns (IExchange) {</span>
+<span id="L61"><span class="lineNum">      61</span> <span class="tlaUNC tlaBgUNC">           0 :     return IExchange(registry.getAddressForOrDie(EXCHANGE_REGISTRY_ID));</span></span>
+<span id="L62"><span class="lineNum">      62</span>              :   }</span>
+<span id="L63"><span class="lineNum">      63</span>              : </span>
+<span id="L64"><span class="lineNum">      64</span>              :   function getFreezer() internal view returns (IFreezer) {</span>
+<span id="L65"><span class="lineNum">      65</span> <span class="tlaUNC">           0 :     return IFreezer(registry.getAddressForOrDie(FREEZER_REGISTRY_ID));</span></span>
+<span id="L66"><span class="lineNum">      66</span>              :   }</span>
+<span id="L67"><span class="lineNum">      67</span>              : </span>
+<span id="L68"><span class="lineNum">      68</span>              :   function getGoldToken() internal view returns (IERC20) {</span>
+<span id="L69"><span class="lineNum">      69</span> <span class="tlaUNC">           0 :     return IERC20(registry.getAddressForOrDie(GOLD_TOKEN_REGISTRY_ID));</span></span>
+<span id="L70"><span class="lineNum">      70</span>              :   }</span>
+<span id="L71"><span class="lineNum">      71</span>              : </span>
+<span id="L72"><span class="lineNum">      72</span>              :   function getReserve() internal view returns (IReserve) {</span>
+<span id="L73"><span class="lineNum">      73</span> <span class="tlaUNC">           0 :     return IReserve(registry.getAddressForOrDie(RESERVE_REGISTRY_ID));</span></span>
+<span id="L74"><span class="lineNum">      74</span>              :   }</span>
+<span id="L75"><span class="lineNum">      75</span>              : </span>
+<span id="L76"><span class="lineNum">      76</span>              :   function getSortedOracles() internal view returns (ISortedOracles) {</span>
+<span id="L77"><span class="lineNum">      77</span> <span class="tlaUNC">           0 :     return ISortedOracles(registry.getAddressForOrDie(SORTED_ORACLES_REGISTRY_ID));</span></span>
+<span id="L78"><span class="lineNum">      78</span>              :   }</span>
+<span id="L79"><span class="lineNum">      79</span>              : </span>
+<span id="L80"><span class="lineNum">      80</span>              :   function getStableToken() internal view returns (IStableTokenV2) {</span>
+<span id="L81"><span class="lineNum">      81</span> <span class="tlaUNC">           0 :     return IStableTokenV2(registry.getAddressForOrDie(STABLE_TOKEN_REGISTRY_ID));</span></span>
+<span id="L82"><span class="lineNum">      82</span>              :   }</span>
+<span id="L83"><span class="lineNum">      83</span>              : }</span>
+        </pre>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/coverage_report/contracts/common/index-sort-f.html b/coverage_report/contracts/common/index-sort-f.html
index 7d54efc..b49cb19 100644
--- a/coverage_report/contracts/common/index-sort-f.html
+++ b/coverage_report/contracts/common/index-sort-f.html
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntryLo">52.9&nbsp;%</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">30.8&nbsp;%</td>
+            <td class="headerCovTableEntry">13</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
                   <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
@@ -79,6 +79,18 @@
                     <td class="tableHead"> Total</td>
                     <td class="tableHead"> Hit</td>
             </tr>
+            <tr>
+              <td class="coverFile"><a href="UsingRegistry.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/common/UsingRegistry.sol">UsingRegistry.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=27 height=10 alt="27.3%"><img src="../../snow.png" width=73 height=10 alt="27.3%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">27.3&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt"></td>
+            </tr>
             <tr>
               <td class="coverFile"><a href="SafeERC20MintableBurnable.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/common/SafeERC20MintableBurnable.sol">SafeERC20MintableBurnable.sol</a></td>
               <td class="coverBar" align="center">
diff --git a/coverage_report/contracts/common/index-sort-l.html b/coverage_report/contracts/common/index-sort-l.html
index f0828ff..b2bd6af 100644
--- a/coverage_report/contracts/common/index-sort-l.html
+++ b/coverage_report/contracts/common/index-sort-l.html
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntryLo">52.9&nbsp;%</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">30.8&nbsp;%</td>
+            <td class="headerCovTableEntry">13</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
                   <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
@@ -79,6 +79,18 @@
                     <td class="tableHead"> Total</td>
                     <td class="tableHead"> Hit</td>
             </tr>
+            <tr>
+              <td class="coverFile"><a href="UsingRegistry.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/common/UsingRegistry.sol">UsingRegistry.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=27 height=10 alt="27.3%"><img src="../../snow.png" width=73 height=10 alt="27.3%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">27.3&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt"></td>
+            </tr>
             <tr>
               <td class="coverFile"><a href="SafeERC20MintableBurnable.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/common/SafeERC20MintableBurnable.sol">SafeERC20MintableBurnable.sol</a></td>
               <td class="coverBar" align="center">
diff --git a/coverage_report/contracts/common/index.html b/coverage_report/contracts/common/index.html
index b1319f6..cd0e31e 100644
--- a/coverage_report/contracts/common/index.html
+++ b/coverage_report/contracts/common/index.html
@@ -31,17 +31,17 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">6</td>
-            <td class="headerCovTableEntry">6</td>
+            <td class="headerCovTableEntryLo">52.9&nbsp;%</td>
+            <td class="headerCovTableEntry">17</td>
+            <td class="headerCovTableEntry">9</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">4</td>
+            <td class="headerCovTableEntryLo">30.8&nbsp;%</td>
+            <td class="headerCovTableEntry">13</td>
             <td class="headerCovTableEntry">4</td>
           </tr>
                   <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
@@ -91,6 +91,18 @@
               <td class="coverNumDflt">4</td>
               <td class="coverNumDflt">4</td>
             </tr>
+            <tr>
+              <td class="coverFile"><a href="UsingRegistry.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/common/UsingRegistry.sol">UsingRegistry.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=27 height=10 alt="27.3%"><img src="../../snow.png" width=73 height=10 alt="27.3%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">27.3&nbsp;%</td>
+              <td class="coverNumDflt">11</td>
+              <td class="coverNumDflt">3</td>
+              <td class="coverPerLo">0.0&nbsp;%</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverNumDflt"></td>
+            </tr>
           </table>
           </center>
           <br>
diff --git a/coverage_report/contracts/index-sort-f.html b/coverage_report/contracts/index-sort-f.html
index a3aa641..43eae4b 100644
--- a/coverage_report/contracts/index-sort-f.html
+++ b/coverage_report/contracts/index-sort-f.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">77.4&nbsp;%</td>
+            <td class="headerCovTableEntryMed">77.8&nbsp;%</td>
             <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">446</td>
+            <td class="headerCovTableEntry">448</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">91.8&nbsp;%</td>
@@ -82,11 +82,11 @@
             <tr>
               <td class="coverFile"><a href="BancorFormula.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/BancorFormula.sol">BancorFormula.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=65 height=10 alt="65.3%"><img src="../snow.png" width=35 height=10 alt="65.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=66 height=10 alt="65.8%"><img src="../snow.png" width=34 height=10 alt="65.8%"></td></tr></table>
               </td>
-              <td class="coverPerLo">65.3&nbsp;%</td>
+              <td class="coverPerLo">65.8&nbsp;%</td>
               <td class="coverNumDflt">357</td>
-              <td class="coverNumDflt">233</td>
+              <td class="coverNumDflt">235</td>
               <td class="coverPerLo">61.5&nbsp;%</td>
               <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">8</td>
diff --git a/coverage_report/contracts/index-sort-l.html b/coverage_report/contracts/index-sort-l.html
index 73c07fc..3622cf7 100644
--- a/coverage_report/contracts/index-sort-l.html
+++ b/coverage_report/contracts/index-sort-l.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">77.4&nbsp;%</td>
+            <td class="headerCovTableEntryMed">77.8&nbsp;%</td>
             <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">446</td>
+            <td class="headerCovTableEntry">448</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">91.8&nbsp;%</td>
@@ -82,11 +82,11 @@
             <tr>
               <td class="coverFile"><a href="BancorFormula.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/BancorFormula.sol">BancorFormula.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=65 height=10 alt="65.3%"><img src="../snow.png" width=35 height=10 alt="65.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=66 height=10 alt="65.8%"><img src="../snow.png" width=34 height=10 alt="65.8%"></td></tr></table>
               </td>
-              <td class="coverPerLo">65.3&nbsp;%</td>
+              <td class="coverPerLo">65.8&nbsp;%</td>
               <td class="coverNumDflt">357</td>
-              <td class="coverNumDflt">233</td>
+              <td class="coverNumDflt">235</td>
               <td class="coverPerLo">61.5&nbsp;%</td>
               <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">8</td>
diff --git a/coverage_report/contracts/index.html b/coverage_report/contracts/index.html
index a8b509b..ddb499d 100644
--- a/coverage_report/contracts/index.html
+++ b/coverage_report/contracts/index.html
@@ -31,13 +31,13 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">77.4&nbsp;%</td>
+            <td class="headerCovTableEntryMed">77.8&nbsp;%</td>
             <td class="headerCovTableEntry">576</td>
-            <td class="headerCovTableEntry">446</td>
+            <td class="headerCovTableEntry">448</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">91.8&nbsp;%</td>
@@ -94,11 +94,11 @@
             <tr>
               <td class="coverFile"><a href="BancorFormula.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/BancorFormula.sol">BancorFormula.sol</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=65 height=10 alt="65.3%"><img src="../snow.png" width=35 height=10 alt="65.3%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=66 height=10 alt="65.8%"><img src="../snow.png" width=34 height=10 alt="65.8%"></td></tr></table>
               </td>
-              <td class="coverPerLo">65.3&nbsp;%</td>
+              <td class="coverPerLo">65.8&nbsp;%</td>
               <td class="coverNumDflt">357</td>
-              <td class="coverNumDflt">233</td>
+              <td class="coverNumDflt">235</td>
               <td class="coverPerLo">61.5&nbsp;%</td>
               <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">8</td>
diff --git a/coverage_report/contracts/libraries/TradingLimits.sol.func-c.html b/coverage_report/contracts/libraries/TradingLimits.sol.func-c.html
index 86691a5..2cb412a 100644
--- a/coverage_report/contracts/libraries/TradingLimits.sol.func-c.html
+++ b/coverage_report/contracts/libraries/TradingLimits.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/contracts/libraries/TradingLimits.sol.func.html b/coverage_report/contracts/libraries/TradingLimits.sol.func.html
index c49b1d8..feeae5d 100644
--- a/coverage_report/contracts/libraries/TradingLimits.sol.func.html
+++ b/coverage_report/contracts/libraries/TradingLimits.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/contracts/libraries/TradingLimits.sol.gcov.html b/coverage_report/contracts/libraries/TradingLimits.sol.gcov.html
index 13f9b71..673b851 100644
--- a/coverage_report/contracts/libraries/TradingLimits.sol.gcov.html
+++ b/coverage_report/contracts/libraries/TradingLimits.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/contracts/libraries/index-sort-f.html b/coverage_report/contracts/libraries/index-sort-f.html
index 08ff325..43fa2f0 100644
--- a/coverage_report/contracts/libraries/index-sort-f.html
+++ b/coverage_report/contracts/libraries/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/contracts/libraries/index-sort-l.html b/coverage_report/contracts/libraries/index-sort-l.html
index 4428711..7dfda71 100644
--- a/coverage_report/contracts/libraries/index-sort-l.html
+++ b/coverage_report/contracts/libraries/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/contracts/libraries/index.html b/coverage_report/contracts/libraries/index.html
index dfc53f9..26721b4 100644
--- a/coverage_report/contracts/libraries/index.html
+++ b/coverage_report/contracts/libraries/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/contracts/swap/Broker.sol.func-c.html b/coverage_report/contracts/swap/Broker.sol.func-c.html
index 3ff2513..1aca676 100644
--- a/coverage_report/contracts/swap/Broker.sol.func-c.html
+++ b/coverage_report/contracts/swap/Broker.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -77,23 +77,23 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Broker.sol.gcov.html#L133">Broker.getAmountIn</a></td>
+              <td class="coverFn"><a href="Broker.sol.gcov.html#L353">Broker.getExchangeProviders</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">3</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Broker.sol.gcov.html#L153">Broker.getAmountOut</a></td>
+              <td class="coverFn"><a href="Broker.sol.gcov.html#L133">Broker.getAmountIn</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Broker.sol.gcov.html#L353">Broker.getExchangeProviders</a></td>
+              <td class="coverFn"><a href="Broker.sol.gcov.html#L153">Broker.getAmountOut</a></td>
               
-              <td class="coverFnHi">3</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
@@ -112,65 +112,65 @@
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Broker.sol.gcov.html#L204">Broker.swapOut</a></td>
+              <td class="coverFn"><a href="Broker.sol.gcov.html#L92">Broker.addExchangeProvider</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">5</td>
               
               
             </tr>
             <tr>
-              <td class="coverFn"><a href="Broker.sol.gcov.html#L92">Broker.addExchangeProvider</a></td>
+              <td class="coverFn"><a href="Broker.sol.gcov.html#L204">Broker.swapOut</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L174">Broker.swapIn</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L292">Broker.transferIn</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L272">Broker.transferOut</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L313">Broker.guardTradingLimits</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L336">Broker.guardTradingLimit</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">19</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L53">Broker.</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">36</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L60">Broker.initialize</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">36</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/swap/Broker.sol.func.html b/coverage_report/contracts/swap/Broker.sol.func.html
index deafa07..0603335 100644
--- a/coverage_report/contracts/swap/Broker.sol.func.html
+++ b/coverage_report/contracts/swap/Broker.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -65,7 +65,7 @@
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L53">Broker.</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">36</td>
               
               
             </tr>
@@ -93,14 +93,14 @@
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L133">Broker.getAmountIn</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L153">Broker.getAmountOut</a></td>
               
-              <td class="coverFnHi">2</td>
+              <td class="coverFnHi">4</td>
               
               
             </tr>
@@ -114,21 +114,21 @@
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L336">Broker.guardTradingLimit</a></td>
               
-              <td class="coverFnHi">11</td>
+              <td class="coverFnHi">19</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L313">Broker.guardTradingLimits</a></td>
               
-              <td class="coverFnHi">6</td>
+              <td class="coverFnHi">10</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L60">Broker.initialize</a></td>
               
-              <td class="coverFnHi">30</td>
+              <td class="coverFnHi">36</td>
               
               
             </tr>
@@ -149,28 +149,28 @@
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L174">Broker.swapIn</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">7</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L204">Broker.swapOut</a></td>
               
-              <td class="coverFnHi">4</td>
+              <td class="coverFnHi">6</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L292">Broker.transferIn</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
             <tr>
               <td class="coverFn"><a href="Broker.sol.gcov.html#L272">Broker.transferOut</a></td>
               
-              <td class="coverFnHi">5</td>
+              <td class="coverFnHi">9</td>
               
               
             </tr>
diff --git a/coverage_report/contracts/swap/Broker.sol.gcov.html b/coverage_report/contracts/swap/Broker.sol.gcov.html
index ae3b04e..0850a55 100644
--- a/coverage_report/contracts/swap/Broker.sol.gcov.html
+++ b/coverage_report/contracts/swap/Broker.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
@@ -122,9 +122,9 @@
 <span id="L60"><span class="lineNum">      60</span>              :    * @param _reserves The addresses of the Reserve contracts.</span>
 <span id="L61"><span class="lineNum">      61</span>              :    */</span>
 <span id="L62"><span class="lineNum">      62</span>              :   function initialize(address[] calldata _exchangeProviders, address[] calldata _reserves) external initializer {</span>
-<span id="L63"><span class="lineNum">      63</span> <span class="tlaGNC tlaBgGNC">          30 :     _transferOwnership(msg.sender);</span></span>
-<span id="L64"><span class="lineNum">      64</span> <span class="tlaGNC">          30 :     for (uint256 i = 0; i &lt; _exchangeProviders.length; i++) {</span></span>
-<span id="L65"><span class="lineNum">      65</span> <span class="tlaGNC">          90 :       addExchangeProvider(_exchangeProviders[i], _reserves[i]);</span></span>
+<span id="L63"><span class="lineNum">      63</span> <span class="tlaGNC tlaBgGNC">          36 :     _transferOwnership(msg.sender);</span></span>
+<span id="L64"><span class="lineNum">      64</span> <span class="tlaGNC">          36 :     for (uint256 i = 0; i &lt; _exchangeProviders.length; i++) {</span></span>
+<span id="L65"><span class="lineNum">      65</span> <span class="tlaGNC">          96 :       addExchangeProvider(_exchangeProviders[i], _reserves[i]);</span></span>
 <span id="L66"><span class="lineNum">      66</span>              :     }</span>
 <span id="L67"><span class="lineNum">      67</span>              :   }</span>
 <span id="L68"><span class="lineNum">      68</span>              : </span>
@@ -157,15 +157,15 @@
 <span id="L95"><span class="lineNum">      95</span>              :     address exchangeProvider,</span>
 <span id="L96"><span class="lineNum">      96</span>              :     address reserve</span>
 <span id="L97"><span class="lineNum">      97</span>              :   ) public override(IBroker, IBrokerAdmin) onlyOwner returns (uint256 index) {</span>
-<span id="L98"><span class="lineNum">      98</span> <span class="tlaGNC">          94 :     require(!isExchangeProvider[exchangeProvider], &quot;ExchangeProvider already exists in the list&quot;);</span></span>
-<span id="L99"><span class="lineNum">      99</span> <span class="tlaGNC">          93 :     require(exchangeProvider != address(0), &quot;ExchangeProvider address can't be 0&quot;);</span></span>
-<span id="L100"><span class="lineNum">     100</span> <span class="tlaGNC">          92 :     require(reserve != address(0), &quot;Reserve address can't be 0&quot;);</span></span>
-<span id="L101"><span class="lineNum">     101</span> <span class="tlaGNC">          91 :     exchangeProviders.push(exchangeProvider);</span></span>
-<span id="L102"><span class="lineNum">     102</span> <span class="tlaGNC">          91 :     isExchangeProvider[exchangeProvider] = true;</span></span>
-<span id="L103"><span class="lineNum">     103</span> <span class="tlaGNC">          91 :     exchangeReserve[exchangeProvider] = reserve;</span></span>
-<span id="L104"><span class="lineNum">     104</span> <span class="tlaGNC">          91 :     emit ExchangeProviderAdded(exchangeProvider);</span></span>
-<span id="L105"><span class="lineNum">     105</span> <span class="tlaGNC">          91 :     emit ReserveSet(exchangeProvider, reserve);</span></span>
-<span id="L106"><span class="lineNum">     106</span> <span class="tlaGNC">          91 :     index = exchangeProviders.length - 1;</span></span>
+<span id="L98"><span class="lineNum">      98</span> <span class="tlaGNC">         100 :     require(!isExchangeProvider[exchangeProvider], &quot;ExchangeProvider already exists in the list&quot;);</span></span>
+<span id="L99"><span class="lineNum">      99</span> <span class="tlaGNC">          99 :     require(exchangeProvider != address(0), &quot;ExchangeProvider address can't be 0&quot;);</span></span>
+<span id="L100"><span class="lineNum">     100</span> <span class="tlaGNC">          98 :     require(reserve != address(0), &quot;Reserve address can't be 0&quot;);</span></span>
+<span id="L101"><span class="lineNum">     101</span> <span class="tlaGNC">          97 :     exchangeProviders.push(exchangeProvider);</span></span>
+<span id="L102"><span class="lineNum">     102</span> <span class="tlaGNC">          97 :     isExchangeProvider[exchangeProvider] = true;</span></span>
+<span id="L103"><span class="lineNum">     103</span> <span class="tlaGNC">          97 :     exchangeReserve[exchangeProvider] = reserve;</span></span>
+<span id="L104"><span class="lineNum">     104</span> <span class="tlaGNC">          97 :     emit ExchangeProviderAdded(exchangeProvider);</span></span>
+<span id="L105"><span class="lineNum">     105</span> <span class="tlaGNC">          97 :     emit ReserveSet(exchangeProvider, reserve);</span></span>
+<span id="L106"><span class="lineNum">     106</span> <span class="tlaGNC">          97 :     index = exchangeProviders.length - 1;</span></span>
 <span id="L107"><span class="lineNum">     107</span>              :   }</span>
 <span id="L108"><span class="lineNum">     108</span>              : </span>
 <span id="L109"><span class="lineNum">     109</span>              :   /**</span>
@@ -201,8 +201,8 @@
 <span id="L139"><span class="lineNum">     139</span>              :     address tokenOut,</span>
 <span id="L140"><span class="lineNum">     140</span>              :     uint256 amountOut</span>
 <span id="L141"><span class="lineNum">     141</span>              :   ) external view returns (uint256 amountIn) {</span>
-<span id="L142"><span class="lineNum">     142</span> <span class="tlaGNC">           2 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
-<span id="L143"><span class="lineNum">     143</span> <span class="tlaGNC">           1 :     amountIn = IExchangeProvider(exchangeProvider).getAmountIn(exchangeId, tokenIn, tokenOut, amountOut);</span></span>
+<span id="L142"><span class="lineNum">     142</span> <span class="tlaGNC">           4 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
+<span id="L143"><span class="lineNum">     143</span> <span class="tlaGNC">           3 :     amountIn = IExchangeProvider(exchangeProvider).getAmountIn(exchangeId, tokenIn, tokenOut, amountOut);</span></span>
 <span id="L144"><span class="lineNum">     144</span>              :   }</span>
 <span id="L145"><span class="lineNum">     145</span>              : </span>
 <span id="L146"><span class="lineNum">     146</span>              :   /**</span>
@@ -221,8 +221,8 @@
 <span id="L159"><span class="lineNum">     159</span>              :     address tokenOut,</span>
 <span id="L160"><span class="lineNum">     160</span>              :     uint256 amountIn</span>
 <span id="L161"><span class="lineNum">     161</span>              :   ) external view returns (uint256 amountOut) {</span>
-<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">           2 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
-<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">           1 :     amountOut = IExchangeProvider(exchangeProvider).getAmountOut(exchangeId, tokenIn, tokenOut, amountIn);</span></span>
+<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">           4 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
+<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">           3 :     amountOut = IExchangeProvider(exchangeProvider).getAmountOut(exchangeId, tokenIn, tokenOut, amountIn);</span></span>
 <span id="L164"><span class="lineNum">     164</span>              :   }</span>
 <span id="L165"><span class="lineNum">     165</span>              : </span>
 <span id="L166"><span class="lineNum">     166</span>              :   /**</span>
@@ -243,16 +243,16 @@
 <span id="L181"><span class="lineNum">     181</span>              :     uint256 amountIn,</span>
 <span id="L182"><span class="lineNum">     182</span>              :     uint256 amountOutMin</span>
 <span id="L183"><span class="lineNum">     183</span>              :   ) external nonReentrant returns (uint256 amountOut) {</span>
-<span id="L184"><span class="lineNum">     184</span> <span class="tlaGNC">           5 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
+<span id="L184"><span class="lineNum">     184</span> <span class="tlaGNC">           7 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
 <span id="L185"><span class="lineNum">     185</span>              :     // slither-disable-next-line reentrancy-benign</span>
-<span id="L186"><span class="lineNum">     186</span> <span class="tlaGNC">           5 :     amountOut = IExchangeProvider(exchangeProvider).swapIn(exchangeId, tokenIn, tokenOut, amountIn);</span></span>
-<span id="L187"><span class="lineNum">     187</span> <span class="tlaGNC">           5 :     require(amountOut &gt;= amountOutMin, &quot;amountOutMin not met&quot;);</span></span>
-<span id="L188"><span class="lineNum">     188</span> <span class="tlaGNC">           4 :     guardTradingLimits(exchangeId, tokenIn, amountIn, tokenOut, amountOut);</span></span>
+<span id="L186"><span class="lineNum">     186</span> <span class="tlaGNC">           7 :     amountOut = IExchangeProvider(exchangeProvider).swapIn(exchangeId, tokenIn, tokenOut, amountIn);</span></span>
+<span id="L187"><span class="lineNum">     187</span> <span class="tlaGNC">           7 :     require(amountOut &gt;= amountOutMin, &quot;amountOutMin not met&quot;);</span></span>
+<span id="L188"><span class="lineNum">     188</span> <span class="tlaGNC">           6 :     guardTradingLimits(exchangeId, tokenIn, amountIn, tokenOut, amountOut);</span></span>
 <span id="L189"><span class="lineNum">     189</span>              : </span>
-<span id="L190"><span class="lineNum">     190</span> <span class="tlaGNC">           3 :     address reserve = exchangeReserve[exchangeProvider];</span></span>
-<span id="L191"><span class="lineNum">     191</span> <span class="tlaGNC">           3 :     transferIn(payable(msg.sender), tokenIn, amountIn, reserve);</span></span>
-<span id="L192"><span class="lineNum">     192</span> <span class="tlaGNC">           3 :     transferOut(payable(msg.sender), tokenOut, amountOut, reserve);</span></span>
-<span id="L193"><span class="lineNum">     193</span> <span class="tlaGNC">           3 :     emit Swap(exchangeProvider, exchangeId, msg.sender, tokenIn, tokenOut, amountIn, amountOut);</span></span>
+<span id="L190"><span class="lineNum">     190</span> <span class="tlaGNC">           5 :     address reserve = exchangeReserve[exchangeProvider];</span></span>
+<span id="L191"><span class="lineNum">     191</span> <span class="tlaGNC">           5 :     transferIn(payable(msg.sender), tokenIn, amountIn, reserve);</span></span>
+<span id="L192"><span class="lineNum">     192</span> <span class="tlaGNC">           5 :     transferOut(payable(msg.sender), tokenOut, amountOut, reserve);</span></span>
+<span id="L193"><span class="lineNum">     193</span> <span class="tlaGNC">           5 :     emit Swap(exchangeProvider, exchangeId, msg.sender, tokenIn, tokenOut, amountIn, amountOut);</span></span>
 <span id="L194"><span class="lineNum">     194</span>              :   }</span>
 <span id="L195"><span class="lineNum">     195</span>              : </span>
 <span id="L196"><span class="lineNum">     196</span>              :   /**</span>
@@ -273,16 +273,16 @@
 <span id="L211"><span class="lineNum">     211</span>              :     uint256 amountOut,</span>
 <span id="L212"><span class="lineNum">     212</span>              :     uint256 amountInMax</span>
 <span id="L213"><span class="lineNum">     213</span>              :   ) external nonReentrant returns (uint256 amountIn) {</span>
-<span id="L214"><span class="lineNum">     214</span> <span class="tlaGNC">           4 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
+<span id="L214"><span class="lineNum">     214</span> <span class="tlaGNC">           6 :     require(isExchangeProvider[exchangeProvider], &quot;ExchangeProvider does not exist&quot;);</span></span>
 <span id="L215"><span class="lineNum">     215</span>              :     // slither-disable-next-line reentrancy-benign</span>
-<span id="L216"><span class="lineNum">     216</span> <span class="tlaGNC">           3 :     amountIn = IExchangeProvider(exchangeProvider).swapOut(exchangeId, tokenIn, tokenOut, amountOut);</span></span>
-<span id="L217"><span class="lineNum">     217</span> <span class="tlaGNC">           3 :     require(amountIn &lt;= amountInMax, &quot;amountInMax exceeded&quot;);</span></span>
-<span id="L218"><span class="lineNum">     218</span> <span class="tlaGNC">           2 :     guardTradingLimits(exchangeId, tokenIn, amountIn, tokenOut, amountOut);</span></span>
+<span id="L216"><span class="lineNum">     216</span> <span class="tlaGNC">           5 :     amountIn = IExchangeProvider(exchangeProvider).swapOut(exchangeId, tokenIn, tokenOut, amountOut);</span></span>
+<span id="L217"><span class="lineNum">     217</span> <span class="tlaGNC">           5 :     require(amountIn &lt;= amountInMax, &quot;amountInMax exceeded&quot;);</span></span>
+<span id="L218"><span class="lineNum">     218</span> <span class="tlaGNC">           4 :     guardTradingLimits(exchangeId, tokenIn, amountIn, tokenOut, amountOut);</span></span>
 <span id="L219"><span class="lineNum">     219</span>              : </span>
-<span id="L220"><span class="lineNum">     220</span> <span class="tlaGNC">           2 :     address reserve = exchangeReserve[exchangeProvider];</span></span>
-<span id="L221"><span class="lineNum">     221</span> <span class="tlaGNC">           2 :     transferIn(payable(msg.sender), tokenIn, amountIn, reserve);</span></span>
-<span id="L222"><span class="lineNum">     222</span> <span class="tlaGNC">           2 :     transferOut(payable(msg.sender), tokenOut, amountOut, reserve);</span></span>
-<span id="L223"><span class="lineNum">     223</span> <span class="tlaGNC">           2 :     emit Swap(exchangeProvider, exchangeId, msg.sender, tokenIn, tokenOut, amountIn, amountOut);</span></span>
+<span id="L220"><span class="lineNum">     220</span> <span class="tlaGNC">           4 :     address reserve = exchangeReserve[exchangeProvider];</span></span>
+<span id="L221"><span class="lineNum">     221</span> <span class="tlaGNC">           4 :     transferIn(payable(msg.sender), tokenIn, amountIn, reserve);</span></span>
+<span id="L222"><span class="lineNum">     222</span> <span class="tlaGNC">           4 :     transferOut(payable(msg.sender), tokenOut, amountOut, reserve);</span></span>
+<span id="L223"><span class="lineNum">     223</span> <span class="tlaGNC">           4 :     emit Swap(exchangeProvider, exchangeId, msg.sender, tokenIn, tokenOut, amountIn, amountOut);</span></span>
 <span id="L224"><span class="lineNum">     224</span>              :   }</span>
 <span id="L225"><span class="lineNum">     225</span>              : </span>
 <span id="L226"><span class="lineNum">     226</span>              :   /**</span>
@@ -334,11 +334,11 @@
 <span id="L272"><span class="lineNum">     272</span>              :    * @param _reserve The address of the corresponding reserve.</span>
 <span id="L273"><span class="lineNum">     273</span>              :    */</span>
 <span id="L274"><span class="lineNum">     274</span>              :   function transferOut(address payable to, address token, uint256 amount, address _reserve) internal {</span>
-<span id="L275"><span class="lineNum">     275</span> <span class="tlaGNC">           5 :     IReserve reserve = IReserve(_reserve);</span></span>
-<span id="L276"><span class="lineNum">     276</span> <span class="tlaGNC">           5 :     if (reserve.isStableAsset(token)) {</span></span>
-<span id="L277"><span class="lineNum">     277</span> <span class="tlaGNC">           3 :       IERC20(token).safeMint(to, amount);</span></span>
-<span id="L278"><span class="lineNum">     278</span> <span class="tlaGNC">           2 :     } else if (reserve.isCollateralAsset(token)) {</span></span>
-<span id="L279"><span class="lineNum">     279</span> <span class="tlaGNC">           2 :       require(reserve.transferExchangeCollateralAsset(token, to, amount), &quot;Transfer of the collateral asset failed&quot;);</span></span>
+<span id="L275"><span class="lineNum">     275</span> <span class="tlaGNC">           9 :     IReserve reserve = IReserve(_reserve);</span></span>
+<span id="L276"><span class="lineNum">     276</span> <span class="tlaGNC">           9 :     if (reserve.isStableAsset(token)) {</span></span>
+<span id="L277"><span class="lineNum">     277</span> <span class="tlaGNC">           5 :       IERC20(token).safeMint(to, amount);</span></span>
+<span id="L278"><span class="lineNum">     278</span> <span class="tlaGNC">           4 :     } else if (reserve.isCollateralAsset(token)) {</span></span>
+<span id="L279"><span class="lineNum">     279</span> <span class="tlaGNC">           4 :       require(reserve.transferExchangeCollateralAsset(token, to, amount), &quot;Transfer of the collateral asset failed&quot;);</span></span>
 <span id="L280"><span class="lineNum">     280</span>              :     } else {</span>
 <span id="L281"><span class="lineNum">     281</span> <span class="tlaUNC tlaBgUNC">           0 :       revert(&quot;Token must be stable or collateral assert&quot;);</span></span>
 <span id="L282"><span class="lineNum">     282</span>              :     }</span>
@@ -354,12 +354,12 @@
 <span id="L292"><span class="lineNum">     292</span>              :    * @param _reserve The address of the corresponding reserve.</span>
 <span id="L293"><span class="lineNum">     293</span>              :    */</span>
 <span id="L294"><span class="lineNum">     294</span>              :   function transferIn(address payable from, address token, uint256 amount, address _reserve) internal {</span>
-<span id="L295"><span class="lineNum">     295</span> <span class="tlaGNC tlaBgGNC">           5 :     IReserve reserve = IReserve(_reserve);</span></span>
-<span id="L296"><span class="lineNum">     296</span> <span class="tlaGNC">           5 :     if (reserve.isStableAsset(token)) {</span></span>
-<span id="L297"><span class="lineNum">     297</span> <span class="tlaGNC">           2 :       IERC20(token).safeTransferFrom(from, address(this), amount);</span></span>
-<span id="L298"><span class="lineNum">     298</span> <span class="tlaGNC">           2 :       IERC20(token).safeBurn(amount);</span></span>
-<span id="L299"><span class="lineNum">     299</span> <span class="tlaGNC">           3 :     } else if (reserve.isCollateralAsset(token)) {</span></span>
-<span id="L300"><span class="lineNum">     300</span> <span class="tlaGNC">           3 :       IERC20(token).safeTransferFrom(from, address(reserve), amount);</span></span>
+<span id="L295"><span class="lineNum">     295</span> <span class="tlaGNC tlaBgGNC">           9 :     IReserve reserve = IReserve(_reserve);</span></span>
+<span id="L296"><span class="lineNum">     296</span> <span class="tlaGNC">           9 :     if (reserve.isStableAsset(token)) {</span></span>
+<span id="L297"><span class="lineNum">     297</span> <span class="tlaGNC">           4 :       IERC20(token).safeTransferFrom(from, address(this), amount);</span></span>
+<span id="L298"><span class="lineNum">     298</span> <span class="tlaGNC">           4 :       IERC20(token).safeBurn(amount);</span></span>
+<span id="L299"><span class="lineNum">     299</span> <span class="tlaGNC">           5 :     } else if (reserve.isCollateralAsset(token)) {</span></span>
+<span id="L300"><span class="lineNum">     300</span> <span class="tlaGNC">           5 :       IERC20(token).safeTransferFrom(from, address(reserve), amount);</span></span>
 <span id="L301"><span class="lineNum">     301</span>              :     } else {</span>
 <span id="L302"><span class="lineNum">     302</span> <span class="tlaUNC tlaBgUNC">           0 :       revert(&quot;Token must be stable or collateral assert&quot;);</span></span>
 <span id="L303"><span class="lineNum">     303</span>              :     }</span>
@@ -381,13 +381,13 @@
 <span id="L319"><span class="lineNum">     319</span>              :     address _tokenOut,</span>
 <span id="L320"><span class="lineNum">     320</span>              :     uint256 amountOut</span>
 <span id="L321"><span class="lineNum">     321</span>              :   ) internal {</span>
-<span id="L322"><span class="lineNum">     322</span> <span class="tlaGNC tlaBgGNC">           6 :     bytes32 tokenIn = bytes32(uint256(uint160(_tokenIn)));</span></span>
-<span id="L323"><span class="lineNum">     323</span> <span class="tlaGNC">           6 :     bytes32 tokenOut = bytes32(uint256(uint160(_tokenOut)));</span></span>
-<span id="L324"><span class="lineNum">     324</span> <span class="tlaGNC">           6 :     require(amountIn &lt;= uint256(MAX_INT256), &quot;amountIn too large&quot;);</span></span>
-<span id="L325"><span class="lineNum">     325</span> <span class="tlaGNC">           6 :     require(amountOut &lt;= uint256(MAX_INT256), &quot;amountOut too large&quot;);</span></span>
+<span id="L322"><span class="lineNum">     322</span> <span class="tlaGNC tlaBgGNC">          10 :     bytes32 tokenIn = bytes32(uint256(uint160(_tokenIn)));</span></span>
+<span id="L323"><span class="lineNum">     323</span> <span class="tlaGNC">          10 :     bytes32 tokenOut = bytes32(uint256(uint160(_tokenOut)));</span></span>
+<span id="L324"><span class="lineNum">     324</span> <span class="tlaGNC">          10 :     require(amountIn &lt;= uint256(MAX_INT256), &quot;amountIn too large&quot;);</span></span>
+<span id="L325"><span class="lineNum">     325</span> <span class="tlaGNC">          10 :     require(amountOut &lt;= uint256(MAX_INT256), &quot;amountOut too large&quot;);</span></span>
 <span id="L326"><span class="lineNum">     326</span>              : </span>
-<span id="L327"><span class="lineNum">     327</span> <span class="tlaGNC">           6 :     guardTradingLimit(exchangeId ^ tokenIn, int256(amountIn), _tokenIn);</span></span>
-<span id="L328"><span class="lineNum">     328</span> <span class="tlaGNC">           5 :     guardTradingLimit(exchangeId ^ tokenOut, -1 * int256(amountOut), _tokenOut);</span></span>
+<span id="L327"><span class="lineNum">     327</span> <span class="tlaGNC">          10 :     guardTradingLimit(exchangeId ^ tokenIn, int256(amountIn), _tokenIn);</span></span>
+<span id="L328"><span class="lineNum">     328</span> <span class="tlaGNC">           9 :     guardTradingLimit(exchangeId ^ tokenOut, -1 * int256(amountOut), _tokenOut);</span></span>
 <span id="L329"><span class="lineNum">     329</span>              :   }</span>
 <span id="L330"><span class="lineNum">     330</span>              : </span>
 <span id="L331"><span class="lineNum">     331</span>              :   /**</span>
@@ -398,8 +398,8 @@
 <span id="L336"><span class="lineNum">     336</span>              :    * @param token the address of the token, used to lookup decimals.</span>
 <span id="L337"><span class="lineNum">     337</span>              :    */</span>
 <span id="L338"><span class="lineNum">     338</span>              :   function guardTradingLimit(bytes32 tradingLimitId, int256 deltaFlow, address token) internal {</span>
-<span id="L339"><span class="lineNum">     339</span> <span class="tlaGNC">          11 :     ITradingLimits.Config memory tradingLimitConfig = tradingLimitsConfig[tradingLimitId];</span></span>
-<span id="L340"><span class="lineNum">     340</span> <span class="tlaGNC">          11 :     if (tradingLimitConfig.flags &gt; 0) {</span></span>
+<span id="L339"><span class="lineNum">     339</span> <span class="tlaGNC">          19 :     ITradingLimits.Config memory tradingLimitConfig = tradingLimitsConfig[tradingLimitId];</span></span>
+<span id="L340"><span class="lineNum">     340</span> <span class="tlaGNC">          19 :     if (tradingLimitConfig.flags &gt; 0) {</span></span>
 <span id="L341"><span class="lineNum">     341</span> <span class="tlaGNC">           2 :       ITradingLimits.State memory tradingLimitState = tradingLimitsState[tradingLimitId];</span></span>
 <span id="L342"><span class="lineNum">     342</span> <span class="tlaGNC">           2 :       tradingLimitState = tradingLimitState.update(tradingLimitConfig, deltaFlow, IERC20Metadata(token).decimals());</span></span>
 <span id="L343"><span class="lineNum">     343</span> <span class="tlaGNC">           2 :       tradingLimitState.verify(tradingLimitConfig);</span></span>
diff --git a/coverage_report/contracts/swap/Reserve.sol.func-c.html b/coverage_report/contracts/swap/Reserve.sol.func-c.html
new file mode 100644
index 0000000..40ff607
--- /dev/null
+++ b/coverage_report/contracts/swap/Reserve.sol.func-c.html
@@ -0,0 +1,397 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info - contracts/swap/Reserve.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory contracts/swap">contracts/swap</a> - Reserve.sol<span style="font-size: 80%;"> (<a href="Reserve.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">38.4&nbsp;%</td>
+            <td class="headerCovTableEntry">198</td>
+            <td class="headerCovTableEntry">76</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">15.2&nbsp;%</td>
+            <td class="headerCovTableEntry">46</td>
+            <td class="headerCovTableEntry">7</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><a href="Reserve.sol.func.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></a></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L646">Reserve._transferGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L818">Reserve.addCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L385">Reserve.addOtherReserveAddress</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L431">Reserve.addSpender</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L865">Reserve.checkIsCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L937">Reserve.computeTobinTax</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L716">Reserve.getAssetAllocationSymbols</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L728">Reserve.getAssetAllocationWeights</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L268">Reserve.getDailySpendingRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L277">Reserve.getDailySpendingRatioForCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L513">Reserve.getExchangeSpenders</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L875">Reserve.getFrozenReserveGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L676">Reserve.getOrComputeTobinTax</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L704">Reserve.getOtherReserveAddresses</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L763">Reserve.getOtherReserveAddressesGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L792">Reserve.getReserveAddressesCollateralAssetBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L755">Reserve.getReserveGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L891">Reserve.getReserveRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L696">Reserve.getTokens</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L745">Reserve.getUnfrozenBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L782">Reserve.getUnfrozenReserveGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L121">Reserve.getVersionNumber</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L454">Reserve.isAllowedToSpendExchange</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L109">Reserve.isStableToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L838">Reserve.removeCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L483">Reserve.removeExchangeSpender</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L404">Reserve.removeOtherReserveAddress</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L441">Reserve.removeSpender</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L364">Reserve.removeToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L308">Reserve.setAssetAllocations</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L212">Reserve.setDailySpendingRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L229">Reserve.setDailySpendingRatioForCollateralAssets</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L288">Reserve.setFrozenGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L190">Reserve.setTobinTax</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L203">Reserve.setTobinTaxReserveRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L180">Reserve.setTobinTaxStalenessThreshold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L556">Reserve.transferCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L664">Reserve.transferExchangeGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L523">Reserve.transferGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L603">Reserve._transferCollateralAsset</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L631">Reserve.transferExchangeCollateralAsset</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L107">Reserve.</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L467">Reserve.addExchangeSpender</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L350">Reserve.addToken</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L146">Reserve.initialize</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L950">Reserve.isStableAsset</a></td>
+              
+              <td class="coverFnHi">20</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/coverage_report/contracts/swap/Reserve.sol.func.html b/coverage_report/contracts/swap/Reserve.sol.func.html
new file mode 100644
index 0000000..a94aaca
--- /dev/null
+++ b/coverage_report/contracts/swap/Reserve.sol.func.html
@@ -0,0 +1,397 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info - contracts/swap/Reserve.sol - functions</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory contracts/swap">contracts/swap</a> - Reserve.sol<span style="font-size: 80%;"> (<a href="Reserve.sol.gcov.html" title="Click to go to source detail">source</a> / functions)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">38.4&nbsp;%</td>
+            <td class="headerCovTableEntry">198</td>
+            <td class="headerCovTableEntry">76</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">15.2&nbsp;%</td>
+            <td class="headerCovTableEntry">46</td>
+            <td class="headerCovTableEntry">7</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <center>
+          <table cellpadding=1 cellspacing=1 border=0>
+            <tr><td><br></td></tr>
+            <tr>
+              <td class="tableHead">Function Name <span  title="Click to sort table by function name" class="tableHeadSort"><img src="../../glass.png" width=10 height=14 alt="Sort by function name" title="Click to sort table by function name" border=0></span></td>
+              
+              <td class="tableHead">Hit count <span  title="Click to sort table by function hit count" class="tableHeadSort"><a href="Reserve.sol.func-c.html"><img src="../../updown.png" width=10 height=14 alt="Sort by function hit count" title="Click to sort table by function hit count" border=0></a></span></td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L107">Reserve.</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L603">Reserve._transferCollateralAsset</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L646">Reserve._transferGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L818">Reserve.addCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L467">Reserve.addExchangeSpender</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L385">Reserve.addOtherReserveAddress</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L431">Reserve.addSpender</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L350">Reserve.addToken</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L865">Reserve.checkIsCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L937">Reserve.computeTobinTax</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L716">Reserve.getAssetAllocationSymbols</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L728">Reserve.getAssetAllocationWeights</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L268">Reserve.getDailySpendingRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L277">Reserve.getDailySpendingRatioForCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L513">Reserve.getExchangeSpenders</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L875">Reserve.getFrozenReserveGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L676">Reserve.getOrComputeTobinTax</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L704">Reserve.getOtherReserveAddresses</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L763">Reserve.getOtherReserveAddressesGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L792">Reserve.getReserveAddressesCollateralAssetBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L755">Reserve.getReserveGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L891">Reserve.getReserveRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L696">Reserve.getTokens</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L745">Reserve.getUnfrozenBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L782">Reserve.getUnfrozenReserveGoldBalance</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L121">Reserve.getVersionNumber</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L146">Reserve.initialize</a></td>
+              
+              <td class="coverFnHi">6</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L454">Reserve.isAllowedToSpendExchange</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L950">Reserve.isStableAsset</a></td>
+              
+              <td class="coverFnHi">20</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L109">Reserve.isStableToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L838">Reserve.removeCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L483">Reserve.removeExchangeSpender</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L404">Reserve.removeOtherReserveAddress</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L441">Reserve.removeSpender</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L364">Reserve.removeToken</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L308">Reserve.setAssetAllocations</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L212">Reserve.setDailySpendingRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L229">Reserve.setDailySpendingRatioForCollateralAssets</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L288">Reserve.setFrozenGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L190">Reserve.setTobinTax</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L203">Reserve.setTobinTaxReserveRatio</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L180">Reserve.setTobinTaxStalenessThreshold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L556">Reserve.transferCollateralAsset</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L631">Reserve.transferExchangeCollateralAsset</a></td>
+              
+              <td class="coverFnHi">2</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L664">Reserve.transferExchangeGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+            <tr>
+              <td class="coverFn"><a href="Reserve.sol.gcov.html#L523">Reserve.transferGold</a></td>
+              
+              <td class="coverFnLo">0</td>
+              
+              
+            </tr>
+          </table>
+          <br>
+          </center>
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/coverage_report/contracts/swap/Reserve.sol.gcov.html b/coverage_report/contracts/swap/Reserve.sol.gcov.html
new file mode 100644
index 0000000..f779c01
--- /dev/null
+++ b/coverage_report/contracts/swap/Reserve.sol.gcov.html
@@ -0,0 +1,1031 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html lang="en">
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>LCOV - lcov.info - contracts/swap/Reserve.sol</title>
+  <link rel="stylesheet" type="text/css" href="../../gcov.css">
+</head>
+
+<body>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="title">LCOV - code coverage report</td></tr>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+
+            <tr>
+              <td width="100%">
+                <table cellpadding=1 border=0 width="100%">
+          <tr>
+            <td width="10%" class="headerItem">Current view:</td>
+            <td width="10%" class="headerValue"><a href="../../index.html" title="Click to go to top-level">top level</a> - <a href="index.html" title="Click to go to directory contracts/swap">contracts/swap</a> - Reserve.sol<span style="font-size: 80%;"> (source / <a href="Reserve.sol.func-c.html" title="Click to go to function table">functions</a>)</span></td>
+            <td width="5%"></td>
+            <td width="5%"></td>
+            <td width="5%" class="headerCovTableHead">Coverage</td>
+            <td width="5%" class="headerCovTableHead" title="Covered + Uncovered code">Total</td>
+            <td width="5%" class="headerCovTableHead" title="Exercised code only">Hit</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test:</td>
+            <td class="headerValue">lcov.info</td>
+            <td></td>
+            <td class="headerItem">Lines:</td>
+            <td class="headerCovTableEntryLo">38.4&nbsp;%</td>
+            <td class="headerCovTableEntry">198</td>
+            <td class="headerCovTableEntry">76</td>
+          </tr>
+          <tr>
+            <td class="headerItem">Test Date:</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
+            <td></td>
+            <td class="headerItem">Functions:</td>
+            <td class="headerCovTableEntryLo">15.2&nbsp;%</td>
+            <td class="headerCovTableEntry">46</td>
+            <td class="headerCovTableEntry">7</td>
+          </tr>
+                  <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+          </table>
+
+          <table cellpadding=0 cellspacing=0 border=0>
+            <tr>
+              <td><br></td>
+            </tr>
+            <tr>
+              <td>
+<pre class="sourceHeading">            Line data    Source code</pre>
+<pre class="source">
+<span id="L1"><span class="lineNum">       1</span>              : // SPDX-License-Identifier: GPL-3.0-or-later</span>
+<span id="L2"><span class="lineNum">       2</span>              : pragma solidity ^0.5.13;</span>
+<span id="L3"><span class="lineNum">       3</span>              : </span>
+<span id="L4"><span class="lineNum">       4</span>              : import &quot;openzeppelin-solidity/contracts/math/SafeMath.sol&quot;;</span>
+<span id="L5"><span class="lineNum">       5</span>              : import &quot;openzeppelin-solidity/contracts/ownership/Ownable.sol&quot;;</span>
+<span id="L6"><span class="lineNum">       6</span>              : import &quot;openzeppelin-solidity/contracts/utils/Address.sol&quot;;</span>
+<span id="L7"><span class="lineNum">       7</span>              : import &quot;openzeppelin-solidity/contracts/token/ERC20/SafeERC20.sol&quot;;</span>
+<span id="L8"><span class="lineNum">       8</span>              : </span>
+<span id="L9"><span class="lineNum">       9</span>              : import &quot;celo/contracts/common/FixidityLib.sol&quot;;</span>
+<span id="L10"><span class="lineNum">      10</span>              : import &quot;celo/contracts/common/Initializable.sol&quot;;</span>
+<span id="L11"><span class="lineNum">      11</span>              : import &quot;celo/contracts/common/interfaces/ICeloVersionedContract.sol&quot;;</span>
+<span id="L12"><span class="lineNum">      12</span>              : import &quot;celo/contracts/common/libraries/ReentrancyGuard.sol&quot;;</span>
+<span id="L13"><span class="lineNum">      13</span>              : </span>
+<span id="L14"><span class="lineNum">      14</span>              : import &quot;contracts/common/UsingRegistry.sol&quot;;</span>
+<span id="L15"><span class="lineNum">      15</span>              : import &quot;contracts/interfaces/IReserve.sol&quot;;</span>
+<span id="L16"><span class="lineNum">      16</span>              : import &quot;contracts/interfaces/ISortedOracles.sol&quot;;</span>
+<span id="L17"><span class="lineNum">      17</span>              : </span>
+<span id="L18"><span class="lineNum">      18</span>              : /**</span>
+<span id="L19"><span class="lineNum">      19</span>              :  * @title Ensures price stability of StableTokens with respect to their pegs</span>
+<span id="L20"><span class="lineNum">      20</span>              :  */</span>
+<span id="L21"><span class="lineNum">      21</span>              : // solhint-disable-next-line max-states-count</span>
+<span id="L22"><span class="lineNum">      22</span>              : contract Reserve is</span>
+<span id="L23"><span class="lineNum">      23</span>              :     IReserve,</span>
+<span id="L24"><span class="lineNum">      24</span>              :     ICeloVersionedContract,</span>
+<span id="L25"><span class="lineNum">      25</span>              :     Ownable,</span>
+<span id="L26"><span class="lineNum">      26</span>              :     Initializable,</span>
+<span id="L27"><span class="lineNum">      27</span>              :     UsingRegistry,</span>
+<span id="L28"><span class="lineNum">      28</span>              :     ReentrancyGuard</span>
+<span id="L29"><span class="lineNum">      29</span>              : {</span>
+<span id="L30"><span class="lineNum">      30</span>              :     using SafeMath for uint256;</span>
+<span id="L31"><span class="lineNum">      31</span>              :     using FixidityLib for FixidityLib.Fraction;</span>
+<span id="L32"><span class="lineNum">      32</span>              :     using Address for address payable; // prettier-ignore</span>
+<span id="L33"><span class="lineNum">      33</span>              :     using SafeERC20 for IERC20;</span>
+<span id="L34"><span class="lineNum">      34</span>              : </span>
+<span id="L35"><span class="lineNum">      35</span>              :     struct TobinTaxCache {</span>
+<span id="L36"><span class="lineNum">      36</span>              :         uint128 numerator;</span>
+<span id="L37"><span class="lineNum">      37</span>              :         uint128 timestamp;</span>
+<span id="L38"><span class="lineNum">      38</span>              :     }</span>
+<span id="L39"><span class="lineNum">      39</span>              : </span>
+<span id="L40"><span class="lineNum">      40</span>              :     mapping(address =&gt; bool) public isToken;</span>
+<span id="L41"><span class="lineNum">      41</span>              :     address[] private _tokens;</span>
+<span id="L42"><span class="lineNum">      42</span>              :     TobinTaxCache public tobinTaxCache;</span>
+<span id="L43"><span class="lineNum">      43</span>              :     uint256 public tobinTaxStalenessThreshold;</span>
+<span id="L44"><span class="lineNum">      44</span>              :     uint256 public tobinTax;</span>
+<span id="L45"><span class="lineNum">      45</span>              :     uint256 public tobinTaxReserveRatio;</span>
+<span id="L46"><span class="lineNum">      46</span>              :     mapping(address =&gt; bool) public isSpender;</span>
+<span id="L47"><span class="lineNum">      47</span>              : </span>
+<span id="L48"><span class="lineNum">      48</span>              :     mapping(address =&gt; bool) public isOtherReserveAddress;</span>
+<span id="L49"><span class="lineNum">      49</span>              :     address[] public otherReserveAddresses;</span>
+<span id="L50"><span class="lineNum">      50</span>              : </span>
+<span id="L51"><span class="lineNum">      51</span>              :     bytes32[] public assetAllocationSymbols;</span>
+<span id="L52"><span class="lineNum">      52</span>              :     mapping(bytes32 =&gt; uint256) public assetAllocationWeights;</span>
+<span id="L53"><span class="lineNum">      53</span>              : </span>
+<span id="L54"><span class="lineNum">      54</span>              :     uint256 public lastSpendingDay;</span>
+<span id="L55"><span class="lineNum">      55</span>              :     uint256 public spendingLimit;</span>
+<span id="L56"><span class="lineNum">      56</span>              :     FixidityLib.Fraction private spendingRatio;</span>
+<span id="L57"><span class="lineNum">      57</span>              : </span>
+<span id="L58"><span class="lineNum">      58</span>              :     uint256 public frozenReserveGoldStartBalance;</span>
+<span id="L59"><span class="lineNum">      59</span>              :     uint256 public frozenReserveGoldStartDay;</span>
+<span id="L60"><span class="lineNum">      60</span>              :     uint256 public frozenReserveGoldDays;</span>
+<span id="L61"><span class="lineNum">      61</span>              : </span>
+<span id="L62"><span class="lineNum">      62</span>              :     mapping(address =&gt; bool) public isExchangeSpender;</span>
+<span id="L63"><span class="lineNum">      63</span>              :     address[] public exchangeSpenderAddresses;</span>
+<span id="L64"><span class="lineNum">      64</span>              :     mapping(address =&gt; FixidityLib.Fraction)</span>
+<span id="L65"><span class="lineNum">      65</span>              :         private collateralAssetDailySpendingRatio;</span>
+<span id="L66"><span class="lineNum">      66</span>              :     mapping(address =&gt; uint256) public collateralAssetLastSpendingDay;</span>
+<span id="L67"><span class="lineNum">      67</span>              :     address[] public collateralAssets;</span>
+<span id="L68"><span class="lineNum">      68</span>              :     mapping(address =&gt; bool) public isCollateralAsset;</span>
+<span id="L69"><span class="lineNum">      69</span>              :     mapping(address =&gt; uint256) public collateralAssetSpendingLimit;</span>
+<span id="L70"><span class="lineNum">      70</span>              : </span>
+<span id="L71"><span class="lineNum">      71</span>              :     event TobinTaxStalenessThresholdSet(uint256 value);</span>
+<span id="L72"><span class="lineNum">      72</span>              :     event DailySpendingRatioSet(uint256 ratio);</span>
+<span id="L73"><span class="lineNum">      73</span>              :     event TokenAdded(address indexed token);</span>
+<span id="L74"><span class="lineNum">      74</span>              :     event TokenRemoved(address indexed token, uint256 index);</span>
+<span id="L75"><span class="lineNum">      75</span>              :     event SpenderAdded(address indexed spender);</span>
+<span id="L76"><span class="lineNum">      76</span>              :     event SpenderRemoved(address indexed spender);</span>
+<span id="L77"><span class="lineNum">      77</span>              :     event OtherReserveAddressAdded(address indexed otherReserveAddress);</span>
+<span id="L78"><span class="lineNum">      78</span>              :     event OtherReserveAddressRemoved(</span>
+<span id="L79"><span class="lineNum">      79</span>              :         address indexed otherReserveAddress,</span>
+<span id="L80"><span class="lineNum">      80</span>              :         uint256 index</span>
+<span id="L81"><span class="lineNum">      81</span>              :     );</span>
+<span id="L82"><span class="lineNum">      82</span>              :     event AssetAllocationSet(bytes32[] symbols, uint256[] weights);</span>
+<span id="L83"><span class="lineNum">      83</span>              :     event ReserveGoldTransferred(</span>
+<span id="L84"><span class="lineNum">      84</span>              :         address indexed spender,</span>
+<span id="L85"><span class="lineNum">      85</span>              :         address indexed to,</span>
+<span id="L86"><span class="lineNum">      86</span>              :         uint256 value</span>
+<span id="L87"><span class="lineNum">      87</span>              :     );</span>
+<span id="L88"><span class="lineNum">      88</span>              :     event TobinTaxSet(uint256 value);</span>
+<span id="L89"><span class="lineNum">      89</span>              :     event TobinTaxReserveRatioSet(uint256 value);</span>
+<span id="L90"><span class="lineNum">      90</span>              :     event ExchangeSpenderAdded(address indexed exchangeSpender);</span>
+<span id="L91"><span class="lineNum">      91</span>              :     event ExchangeSpenderRemoved(address indexed exchangeSpender);</span>
+<span id="L92"><span class="lineNum">      92</span>              :     event DailySpendingRatioForCollateralAssetSet(</span>
+<span id="L93"><span class="lineNum">      93</span>              :         address collateralAsset,</span>
+<span id="L94"><span class="lineNum">      94</span>              :         uint256 collateralAssetDailySpendingRatios</span>
+<span id="L95"><span class="lineNum">      95</span>              :     );</span>
+<span id="L96"><span class="lineNum">      96</span>              :     event ReserveCollateralAssetsTransferred(</span>
+<span id="L97"><span class="lineNum">      97</span>              :         address indexed spender,</span>
+<span id="L98"><span class="lineNum">      98</span>              :         address indexed to,</span>
+<span id="L99"><span class="lineNum">      99</span>              :         uint256 value,</span>
+<span id="L100"><span class="lineNum">     100</span>              :         address token</span>
+<span id="L101"><span class="lineNum">     101</span>              :     );</span>
+<span id="L102"><span class="lineNum">     102</span>              :     event CollateralAssetRemoved(address collateralAsset);</span>
+<span id="L103"><span class="lineNum">     103</span>              :     event CollateralAssetAdded(address collateralAsset);</span>
+<span id="L104"><span class="lineNum">     104</span>              : </span>
+<span id="L105"><span class="lineNum">     105</span>              :     /**</span>
+<span id="L106"><span class="lineNum">     106</span>              :      * @notice Sets initialized == true on implementation contracts</span>
+<span id="L107"><span class="lineNum">     107</span>              :      * @param test Set to true to skip implementation initialization</span>
+<span id="L108"><span class="lineNum">     108</span>              :      */</span>
+<span id="L109"><span class="lineNum">     109</span>              :     constructor(bool test) public Initializable(test) {}</span>
+<span id="L110"><span class="lineNum">     110</span>              : </span>
+<span id="L111"><span class="lineNum">     111</span>              :     modifier isStableToken(address token) {</span>
+<span id="L112"><span class="lineNum">     112</span> <span class="tlaUNC tlaBgUNC">           0 :         require(isToken[token], &quot;token addr was never registered&quot;);</span></span>
+<span id="L113"><span class="lineNum">     113</span>              :         _;</span>
+<span id="L114"><span class="lineNum">     114</span>              :     }</span>
+<span id="L115"><span class="lineNum">     115</span>              : </span>
+<span id="L116"><span class="lineNum">     116</span>              :     /**</span>
+<span id="L117"><span class="lineNum">     117</span>              :      * @notice Returns the storage, major, minor, and patch version of the contract.</span>
+<span id="L118"><span class="lineNum">     118</span>              :      * @return Storage version of the contract.</span>
+<span id="L119"><span class="lineNum">     119</span>              :      * @return Major version of the contract.</span>
+<span id="L120"><span class="lineNum">     120</span>              :      * @return Minor version of the contract.</span>
+<span id="L121"><span class="lineNum">     121</span>              :      * @return Patch version of the contract.</span>
+<span id="L122"><span class="lineNum">     122</span>              :      */</span>
+<span id="L123"><span class="lineNum">     123</span>              :     function getVersionNumber()</span>
+<span id="L124"><span class="lineNum">     124</span>              :         external</span>
+<span id="L125"><span class="lineNum">     125</span>              :         pure</span>
+<span id="L126"><span class="lineNum">     126</span>              :         returns (uint256, uint256, uint256, uint256)</span>
+<span id="L127"><span class="lineNum">     127</span>              :     {</span>
+<span id="L128"><span class="lineNum">     128</span> <span class="tlaUNC">           0 :         return (2, 1, 0, 0);</span></span>
+<span id="L129"><span class="lineNum">     129</span>              :     }</span>
+<span id="L130"><span class="lineNum">     130</span>              : </span>
+<span id="L131"><span class="lineNum">     131</span>              :     function() external payable {} // solhint-disable no-empty-blocks</span>
+<span id="L132"><span class="lineNum">     132</span>              : </span>
+<span id="L133"><span class="lineNum">     133</span>              :     /**</span>
+<span id="L134"><span class="lineNum">     134</span>              :      * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.</span>
+<span id="L135"><span class="lineNum">     135</span>              :      * @param registryAddress The address of the registry core smart contract.</span>
+<span id="L136"><span class="lineNum">     136</span>              :      * @param _tobinTaxStalenessThreshold The initial number of seconds to cache tobin tax value for.</span>
+<span id="L137"><span class="lineNum">     137</span>              :      * @param _spendingRatioForCelo The relative daily spending limit for the reserve spender.</span>
+<span id="L138"><span class="lineNum">     138</span>              :      * @param _frozenGold The balance of reserve gold that is frozen.</span>
+<span id="L139"><span class="lineNum">     139</span>              :      * @param _frozenDays The number of days during which the frozen gold thaws.</span>
+<span id="L140"><span class="lineNum">     140</span>              :      * @param _assetAllocationSymbols The symbols of the reserve assets.</span>
+<span id="L141"><span class="lineNum">     141</span>              :      * @param _assetAllocationWeights The reserve asset weights.</span>
+<span id="L142"><span class="lineNum">     142</span>              :      * @param _tobinTax The tobin tax value as a fixidity fraction.</span>
+<span id="L143"><span class="lineNum">     143</span>              :      * @param _tobinTaxReserveRatio When to turn on the tobin tax, as a fixidity fraction.</span>
+<span id="L144"><span class="lineNum">     144</span>              :      * @param _collateralAssets The relative daily spending limit</span>
+<span id="L145"><span class="lineNum">     145</span>              :      * of an ERC20 collateral asset for the reserve spender.</span>
+<span id="L146"><span class="lineNum">     146</span>              :      * @param _collateralAssetDailySpendingRatios The address of an ERC20 collateral asset</span>
+<span id="L147"><span class="lineNum">     147</span>              :      */</span>
+<span id="L148"><span class="lineNum">     148</span>              :     function initialize(</span>
+<span id="L149"><span class="lineNum">     149</span>              :         address registryAddress,</span>
+<span id="L150"><span class="lineNum">     150</span>              :         uint256 _tobinTaxStalenessThreshold,</span>
+<span id="L151"><span class="lineNum">     151</span>              :         uint256 _spendingRatioForCelo,</span>
+<span id="L152"><span class="lineNum">     152</span>              :         uint256 _frozenGold,</span>
+<span id="L153"><span class="lineNum">     153</span>              :         uint256 _frozenDays,</span>
+<span id="L154"><span class="lineNum">     154</span>              :         bytes32[] calldata _assetAllocationSymbols,</span>
+<span id="L155"><span class="lineNum">     155</span>              :         uint256[] calldata _assetAllocationWeights,</span>
+<span id="L156"><span class="lineNum">     156</span>              :         uint256 _tobinTax,</span>
+<span id="L157"><span class="lineNum">     157</span>              :         uint256 _tobinTaxReserveRatio,</span>
+<span id="L158"><span class="lineNum">     158</span>              :         address[] calldata _collateralAssets,</span>
+<span id="L159"><span class="lineNum">     159</span>              :         uint256[] calldata _collateralAssetDailySpendingRatios</span>
+<span id="L160"><span class="lineNum">     160</span>              :     ) external initializer {</span>
+<span id="L161"><span class="lineNum">     161</span> <span class="tlaGNC tlaBgGNC">           6 :         _transferOwnership(msg.sender);</span></span>
+<span id="L162"><span class="lineNum">     162</span> <span class="tlaGNC">           6 :         setRegistry(registryAddress);</span></span>
+<span id="L163"><span class="lineNum">     163</span> <span class="tlaGNC">           6 :         setTobinTaxStalenessThreshold(_tobinTaxStalenessThreshold);</span></span>
+<span id="L164"><span class="lineNum">     164</span> <span class="tlaGNC">           6 :         setDailySpendingRatio(_spendingRatioForCelo);</span></span>
+<span id="L165"><span class="lineNum">     165</span> <span class="tlaGNC">           6 :         setFrozenGold(_frozenGold, _frozenDays);</span></span>
+<span id="L166"><span class="lineNum">     166</span> <span class="tlaGNC">           6 :         setAssetAllocations(_assetAllocationSymbols, _assetAllocationWeights);</span></span>
+<span id="L167"><span class="lineNum">     167</span> <span class="tlaGNC">           6 :         setTobinTax(_tobinTax);</span></span>
+<span id="L168"><span class="lineNum">     168</span> <span class="tlaGNC">           6 :         setTobinTaxReserveRatio(_tobinTaxReserveRatio);</span></span>
+<span id="L169"><span class="lineNum">     169</span> <span class="tlaGNC">           6 :         for (uint256 i = 0; i &lt; _collateralAssets.length; i++) {</span></span>
+<span id="L170"><span class="lineNum">     170</span> <span class="tlaGNC">           6 :             addCollateralAsset(_collateralAssets[i]);</span></span>
+<span id="L171"><span class="lineNum">     171</span>              :         }</span>
+<span id="L172"><span class="lineNum">     172</span> <span class="tlaGNC">           6 :         setDailySpendingRatioForCollateralAssets(</span></span>
+<span id="L173"><span class="lineNum">     173</span>              :             _collateralAssets,</span>
+<span id="L174"><span class="lineNum">     174</span>              :             _collateralAssetDailySpendingRatios</span>
+<span id="L175"><span class="lineNum">     175</span>              :         );</span>
+<span id="L176"><span class="lineNum">     176</span>              :     }</span>
+<span id="L177"><span class="lineNum">     177</span>              : </span>
+<span id="L178"><span class="lineNum">     178</span>              :     /**</span>
+<span id="L179"><span class="lineNum">     179</span>              :      * @notice Sets the number of seconds to cache the tobin tax value for.</span>
+<span id="L180"><span class="lineNum">     180</span>              :      * @param value The number of seconds to cache the tobin tax value for.</span>
+<span id="L181"><span class="lineNum">     181</span>              :      */</span>
+<span id="L182"><span class="lineNum">     182</span>              :     function setTobinTaxStalenessThreshold(uint256 value) public onlyOwner {</span>
+<span id="L183"><span class="lineNum">     183</span> <span class="tlaGNC">           6 :         require(value &gt; 0, &quot;value was zero&quot;);</span></span>
+<span id="L184"><span class="lineNum">     184</span> <span class="tlaGNC">           6 :         tobinTaxStalenessThreshold = value;</span></span>
+<span id="L185"><span class="lineNum">     185</span> <span class="tlaGNC">           6 :         emit TobinTaxStalenessThresholdSet(value);</span></span>
+<span id="L186"><span class="lineNum">     186</span>              :     }</span>
+<span id="L187"><span class="lineNum">     187</span>              : </span>
+<span id="L188"><span class="lineNum">     188</span>              :     /**</span>
+<span id="L189"><span class="lineNum">     189</span>              :      * @notice Sets the tobin tax.</span>
+<span id="L190"><span class="lineNum">     190</span>              :      * @param value The tobin tax.</span>
+<span id="L191"><span class="lineNum">     191</span>              :      */</span>
+<span id="L192"><span class="lineNum">     192</span>              :     function setTobinTax(uint256 value) public onlyOwner {</span>
+<span id="L193"><span class="lineNum">     193</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L194"><span class="lineNum">     194</span>              :             FixidityLib.wrap(value).lte(FixidityLib.fixed1()),</span>
+<span id="L195"><span class="lineNum">     195</span>              :             &quot;tobin tax cannot be larger than 1&quot;</span>
+<span id="L196"><span class="lineNum">     196</span>              :         );</span>
+<span id="L197"><span class="lineNum">     197</span> <span class="tlaGNC">           6 :         tobinTax = value;</span></span>
+<span id="L198"><span class="lineNum">     198</span> <span class="tlaGNC">           6 :         emit TobinTaxSet(value);</span></span>
+<span id="L199"><span class="lineNum">     199</span>              :     }</span>
+<span id="L200"><span class="lineNum">     200</span>              : </span>
+<span id="L201"><span class="lineNum">     201</span>              :     /**</span>
+<span id="L202"><span class="lineNum">     202</span>              :      * @notice Sets the reserve ratio at which the tobin tax sets in.</span>
+<span id="L203"><span class="lineNum">     203</span>              :      * @param value The reserve ratio at which the tobin tax sets in.</span>
+<span id="L204"><span class="lineNum">     204</span>              :      */</span>
+<span id="L205"><span class="lineNum">     205</span>              :     function setTobinTaxReserveRatio(uint256 value) public onlyOwner {</span>
+<span id="L206"><span class="lineNum">     206</span> <span class="tlaGNC">           6 :         tobinTaxReserveRatio = value;</span></span>
+<span id="L207"><span class="lineNum">     207</span> <span class="tlaGNC">           6 :         emit TobinTaxReserveRatioSet(value);</span></span>
+<span id="L208"><span class="lineNum">     208</span>              :     }</span>
+<span id="L209"><span class="lineNum">     209</span>              : </span>
+<span id="L210"><span class="lineNum">     210</span>              :     /**</span>
+<span id="L211"><span class="lineNum">     211</span>              :      * @notice Set the ratio of reserve that is spendable per day.</span>
+<span id="L212"><span class="lineNum">     212</span>              :      * @param ratio Spending ratio as unwrapped Fraction.</span>
+<span id="L213"><span class="lineNum">     213</span>              :      */</span>
+<span id="L214"><span class="lineNum">     214</span>              :     function setDailySpendingRatio(uint256 ratio) public onlyOwner {</span>
+<span id="L215"><span class="lineNum">     215</span> <span class="tlaGNC">           6 :         spendingRatio = FixidityLib.wrap(ratio);</span></span>
+<span id="L216"><span class="lineNum">     216</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L217"><span class="lineNum">     217</span>              :             spendingRatio.lte(FixidityLib.fixed1()),</span>
+<span id="L218"><span class="lineNum">     218</span>              :             &quot;spending ratio cannot be larger than 1&quot;</span>
+<span id="L219"><span class="lineNum">     219</span>              :         );</span>
+<span id="L220"><span class="lineNum">     220</span> <span class="tlaGNC">           6 :         emit DailySpendingRatioSet(ratio);</span></span>
+<span id="L221"><span class="lineNum">     221</span>              :     }</span>
+<span id="L222"><span class="lineNum">     222</span>              : </span>
+<span id="L223"><span class="lineNum">     223</span>              :     /**</span>
+<span id="L224"><span class="lineNum">     224</span>              :      * @notice Set the ratio of reserve for a given collateral asset</span>
+<span id="L225"><span class="lineNum">     225</span>              :      * that is spendable per day.</span>
+<span id="L226"><span class="lineNum">     226</span>              :      * @param _collateralAssets Collection of the addresses of collateral assets</span>
+<span id="L227"><span class="lineNum">     227</span>              :      * we're setting a limit for.</span>
+<span id="L228"><span class="lineNum">     228</span>              :      * @param collateralAssetDailySpendingRatios Collection of the relative daily spending limits</span>
+<span id="L229"><span class="lineNum">     229</span>              :      * of collateral assets.</span>
+<span id="L230"><span class="lineNum">     230</span>              :      */</span>
+<span id="L231"><span class="lineNum">     231</span>              :     function setDailySpendingRatioForCollateralAssets(</span>
+<span id="L232"><span class="lineNum">     232</span>              :         address[] memory _collateralAssets,</span>
+<span id="L233"><span class="lineNum">     233</span>              :         uint256[] memory collateralAssetDailySpendingRatios</span>
+<span id="L234"><span class="lineNum">     234</span>              :     ) public onlyOwner {</span>
+<span id="L235"><span class="lineNum">     235</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L236"><span class="lineNum">     236</span>              :             _collateralAssets.length ==</span>
+<span id="L237"><span class="lineNum">     237</span>              :                 collateralAssetDailySpendingRatios.length,</span>
+<span id="L238"><span class="lineNum">     238</span>              :             &quot;token addresses and spending ratio lengths have to be the same&quot;</span>
+<span id="L239"><span class="lineNum">     239</span>              :         );</span>
+<span id="L240"><span class="lineNum">     240</span> <span class="tlaGNC">           6 :         for (uint256 i = 0; i &lt; _collateralAssets.length; i++) {</span></span>
+<span id="L241"><span class="lineNum">     241</span>              :             if (</span>
+<span id="L242"><span class="lineNum">     242</span> <span class="tlaGNC">           6 :                 _collateralAssets[i] != address(0) &amp;&amp;</span></span>
+<span id="L243"><span class="lineNum">     243</span> <span class="tlaGNC">           6 :                 collateralAssetDailySpendingRatios[i] != 0</span></span>
+<span id="L244"><span class="lineNum">     244</span> <span class="tlaGNC">           6 :             ) {</span></span>
+<span id="L245"><span class="lineNum">     245</span> <span class="tlaGNC">           6 :                 require(</span></span>
+<span id="L246"><span class="lineNum">     246</span>              :                     checkIsCollateralAsset(_collateralAssets[i]),</span>
+<span id="L247"><span class="lineNum">     247</span>              :                     &quot;the address specified is not a reserve collateral asset&quot;</span>
+<span id="L248"><span class="lineNum">     248</span>              :                 );</span>
+<span id="L249"><span class="lineNum">     249</span> <span class="tlaGNC">           6 :                 require(</span></span>
+<span id="L250"><span class="lineNum">     250</span>              :                     FixidityLib.wrap(collateralAssetDailySpendingRatios[i]).lte(</span>
+<span id="L251"><span class="lineNum">     251</span>              :                         FixidityLib.fixed1()</span>
+<span id="L252"><span class="lineNum">     252</span>              :                     ),</span>
+<span id="L253"><span class="lineNum">     253</span>              :                     &quot;spending ratio cannot be larger than 1&quot;</span>
+<span id="L254"><span class="lineNum">     254</span>              :                 );</span>
+<span id="L255"><span class="lineNum">     255</span> <span class="tlaGNC">           6 :                 collateralAssetDailySpendingRatio[</span></span>
+<span id="L256"><span class="lineNum">     256</span>              :                     _collateralAssets[i]</span>
+<span id="L257"><span class="lineNum">     257</span>              :                 ] = FixidityLib.wrap(collateralAssetDailySpendingRatios[i]);</span>
+<span id="L258"><span class="lineNum">     258</span> <span class="tlaGNC">           6 :                 emit DailySpendingRatioForCollateralAssetSet(</span></span>
+<span id="L259"><span class="lineNum">     259</span>              :                     _collateralAssets[i],</span>
+<span id="L260"><span class="lineNum">     260</span>              :                     collateralAssetDailySpendingRatios[i]</span>
+<span id="L261"><span class="lineNum">     261</span>              :                 );</span>
+<span id="L262"><span class="lineNum">     262</span>              :             }</span>
+<span id="L263"><span class="lineNum">     263</span>              :         }</span>
+<span id="L264"><span class="lineNum">     264</span>              :     }</span>
+<span id="L265"><span class="lineNum">     265</span>              : </span>
+<span id="L266"><span class="lineNum">     266</span>              :     /**</span>
+<span id="L267"><span class="lineNum">     267</span>              :      * @notice Get daily spending ratio.</span>
+<span id="L268"><span class="lineNum">     268</span>              :      * @return Spending ratio as unwrapped Fraction.</span>
+<span id="L269"><span class="lineNum">     269</span>              :      */</span>
+<span id="L270"><span class="lineNum">     270</span>              :     function getDailySpendingRatio() public view returns (uint256) {</span>
+<span id="L271"><span class="lineNum">     271</span> <span class="tlaUNC tlaBgUNC">           0 :         return spendingRatio.unwrap();</span></span>
+<span id="L272"><span class="lineNum">     272</span>              :     }</span>
+<span id="L273"><span class="lineNum">     273</span>              : </span>
+<span id="L274"><span class="lineNum">     274</span>              :     /**</span>
+<span id="L275"><span class="lineNum">     275</span>              :      * @notice Get daily spending ratio of a collateral asset.</span>
+<span id="L276"><span class="lineNum">     276</span>              :      * @param collateralAsset The address of a collateral asset we're getting a spending ratio for.</span>
+<span id="L277"><span class="lineNum">     277</span>              :      * @return Daily spending ratio for the collateral asset as unwrapped Fraction.</span>
+<span id="L278"><span class="lineNum">     278</span>              :      */</span>
+<span id="L279"><span class="lineNum">     279</span>              :     function getDailySpendingRatioForCollateralAsset(</span>
+<span id="L280"><span class="lineNum">     280</span>              :         address collateralAsset</span>
+<span id="L281"><span class="lineNum">     281</span>              :     ) public view returns (uint256) {</span>
+<span id="L282"><span class="lineNum">     282</span> <span class="tlaUNC">           0 :         return collateralAssetDailySpendingRatio[collateralAsset].unwrap();</span></span>
+<span id="L283"><span class="lineNum">     283</span>              :     }</span>
+<span id="L284"><span class="lineNum">     284</span>              : </span>
+<span id="L285"><span class="lineNum">     285</span>              :     /**</span>
+<span id="L286"><span class="lineNum">     286</span>              :      * @notice Sets the balance of reserve gold frozen from transfer.</span>
+<span id="L287"><span class="lineNum">     287</span>              :      * @param frozenGold The amount of CELO frozen.</span>
+<span id="L288"><span class="lineNum">     288</span>              :      * @param frozenDays The number of days the frozen CELO thaws over.</span>
+<span id="L289"><span class="lineNum">     289</span>              :      */</span>
+<span id="L290"><span class="lineNum">     290</span>              :     function setFrozenGold(</span>
+<span id="L291"><span class="lineNum">     291</span>              :         uint256 frozenGold,</span>
+<span id="L292"><span class="lineNum">     292</span>              :         uint256 frozenDays</span>
+<span id="L293"><span class="lineNum">     293</span>              :     ) public onlyOwner {</span>
+<span id="L294"><span class="lineNum">     294</span> <span class="tlaGNC tlaBgGNC">           6 :         require(</span></span>
+<span id="L295"><span class="lineNum">     295</span>              :             frozenGold &lt;= address(this).balance,</span>
+<span id="L296"><span class="lineNum">     296</span>              :             &quot;Cannot freeze more than balance&quot;</span>
+<span id="L297"><span class="lineNum">     297</span>              :         );</span>
+<span id="L298"><span class="lineNum">     298</span> <span class="tlaGNC">           6 :         frozenReserveGoldStartBalance = frozenGold;</span></span>
+<span id="L299"><span class="lineNum">     299</span>              :         // slither-disable-start events-maths</span>
+<span id="L300"><span class="lineNum">     300</span> <span class="tlaGNC">           6 :         frozenReserveGoldStartDay = now / 1 days;</span></span>
+<span id="L301"><span class="lineNum">     301</span> <span class="tlaGNC">           6 :         frozenReserveGoldDays = frozenDays;</span></span>
+<span id="L302"><span class="lineNum">     302</span>              :         // slither-disable-end events-maths</span>
+<span id="L303"><span class="lineNum">     303</span>              :     }</span>
+<span id="L304"><span class="lineNum">     304</span>              : </span>
+<span id="L305"><span class="lineNum">     305</span>              :     /**</span>
+<span id="L306"><span class="lineNum">     306</span>              :      * @notice Sets target allocations for CELO and a diversified basket of non-Celo assets.</span>
+<span id="L307"><span class="lineNum">     307</span>              :      * @param symbols The symbol of each asset in the Reserve portfolio.</span>
+<span id="L308"><span class="lineNum">     308</span>              :      * @param weights The weight for the corresponding asset as unwrapped Fixidity.Fraction.</span>
+<span id="L309"><span class="lineNum">     309</span>              :      */</span>
+<span id="L310"><span class="lineNum">     310</span>              :     function setAssetAllocations(</span>
+<span id="L311"><span class="lineNum">     311</span>              :         bytes32[] memory symbols,</span>
+<span id="L312"><span class="lineNum">     312</span>              :         uint256[] memory weights</span>
+<span id="L313"><span class="lineNum">     313</span>              :     ) public onlyOwner {</span>
+<span id="L314"><span class="lineNum">     314</span> <span class="tlaGNC">           6 :         require(symbols.length == weights.length, &quot;Array length mismatch&quot;);</span></span>
+<span id="L315"><span class="lineNum">     315</span> <span class="tlaGNC">           6 :         FixidityLib.Fraction memory sum = FixidityLib.wrap(0);</span></span>
+<span id="L316"><span class="lineNum">     316</span> <span class="tlaGNC">           6 :         for (uint256 i = 0; i &lt; weights.length; i = i.add(1)) {</span></span>
+<span id="L317"><span class="lineNum">     317</span> <span class="tlaGNC">          12 :             sum = sum.add(FixidityLib.wrap(weights[i]));</span></span>
+<span id="L318"><span class="lineNum">     318</span>              :         }</span>
+<span id="L319"><span class="lineNum">     319</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L320"><span class="lineNum">     320</span>              :             sum.equals(FixidityLib.fixed1()),</span>
+<span id="L321"><span class="lineNum">     321</span>              :             &quot;Sum of asset allocation must be 1&quot;</span>
+<span id="L322"><span class="lineNum">     322</span>              :         );</span>
+<span id="L323"><span class="lineNum">     323</span>              :         // slither-disable-next-line cache-array-length</span>
+<span id="L324"><span class="lineNum">     324</span> <span class="tlaGNC">           6 :         for (uint256 i = 0; i &lt; assetAllocationSymbols.length; i = i.add(1)) {</span></span>
+<span id="L325"><span class="lineNum">     325</span> <span class="tlaUNC tlaBgUNC">           0 :             delete assetAllocationWeights[assetAllocationSymbols[i]];</span></span>
+<span id="L326"><span class="lineNum">     326</span>              :         }</span>
+<span id="L327"><span class="lineNum">     327</span> <span class="tlaGNC tlaBgGNC">           6 :         assetAllocationSymbols = symbols;</span></span>
+<span id="L328"><span class="lineNum">     328</span> <span class="tlaGNC">           6 :         for (uint256 i = 0; i &lt; symbols.length; i = i.add(1)) {</span></span>
+<span id="L329"><span class="lineNum">     329</span> <span class="tlaGNC">          12 :             require(</span></span>
+<span id="L330"><span class="lineNum">     330</span>              :                 assetAllocationWeights[symbols[i]] == 0,</span>
+<span id="L331"><span class="lineNum">     331</span>              :                 &quot;Cannot set weight twice&quot;</span>
+<span id="L332"><span class="lineNum">     332</span>              :             );</span>
+<span id="L333"><span class="lineNum">     333</span> <span class="tlaGNC">          12 :             assetAllocationWeights[symbols[i]] = weights[i];</span></span>
+<span id="L334"><span class="lineNum">     334</span>              :         }</span>
+<span id="L335"><span class="lineNum">     335</span>              :         // NOTE: The CELO asset launched as &quot;Celo Gold&quot; (cGLD), but was renamed to</span>
+<span id="L336"><span class="lineNum">     336</span>              :         // just CELO by the community.</span>
+<span id="L337"><span class="lineNum">     337</span>              :         // TODO: Change &quot;cGLD&quot; to &quot;CELO&quot; in this file, after ensuring that any</span>
+<span id="L338"><span class="lineNum">     338</span>              :         // off chain tools working with asset allocation weights are aware of this</span>
+<span id="L339"><span class="lineNum">     339</span>              :         // change.</span>
+<span id="L340"><span class="lineNum">     340</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L341"><span class="lineNum">     341</span>              :             assetAllocationWeights[&quot;cGLD&quot;] != 0,</span>
+<span id="L342"><span class="lineNum">     342</span>              :             &quot;Must set cGLD asset weight&quot;</span>
+<span id="L343"><span class="lineNum">     343</span>              :         );</span>
+<span id="L344"><span class="lineNum">     344</span> <span class="tlaGNC">           6 :         emit AssetAllocationSet(symbols, weights);</span></span>
+<span id="L345"><span class="lineNum">     345</span>              :     }</span>
+<span id="L346"><span class="lineNum">     346</span>              : </span>
+<span id="L347"><span class="lineNum">     347</span>              :     /**</span>
+<span id="L348"><span class="lineNum">     348</span>              :      * @notice Add a token that the reserve will stabilize.</span>
+<span id="L349"><span class="lineNum">     349</span>              :      * @param token The address of the token being stabilized.</span>
+<span id="L350"><span class="lineNum">     350</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L351"><span class="lineNum">     351</span>              :      */</span>
+<span id="L352"><span class="lineNum">     352</span>              :     function addToken(address token) external onlyOwner returns (bool) {</span>
+<span id="L353"><span class="lineNum">     353</span> <span class="tlaGNC">           6 :         require(!isToken[token], &quot;token addr already registered&quot;);</span></span>
+<span id="L354"><span class="lineNum">     354</span> <span class="tlaGNC">           6 :         isToken[token] = true;</span></span>
+<span id="L355"><span class="lineNum">     355</span> <span class="tlaGNC">           6 :         _tokens.push(token);</span></span>
+<span id="L356"><span class="lineNum">     356</span> <span class="tlaGNC">           6 :         emit TokenAdded(token);</span></span>
+<span id="L357"><span class="lineNum">     357</span> <span class="tlaGNC">           6 :         return true;</span></span>
+<span id="L358"><span class="lineNum">     358</span>              :     }</span>
+<span id="L359"><span class="lineNum">     359</span>              : </span>
+<span id="L360"><span class="lineNum">     360</span>              :     /**</span>
+<span id="L361"><span class="lineNum">     361</span>              :      * @notice Remove a token that the reserve will no longer stabilize.</span>
+<span id="L362"><span class="lineNum">     362</span>              :      * @param token The address of the token no longer being stabilized.</span>
+<span id="L363"><span class="lineNum">     363</span>              :      * @param index The index of the token in _tokens.</span>
+<span id="L364"><span class="lineNum">     364</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L365"><span class="lineNum">     365</span>              :      */</span>
+<span id="L366"><span class="lineNum">     366</span>              :     function removeToken(</span>
+<span id="L367"><span class="lineNum">     367</span>              :         address token,</span>
+<span id="L368"><span class="lineNum">     368</span>              :         uint256 index</span>
+<span id="L369"><span class="lineNum">     369</span>              :     ) external onlyOwner isStableToken(token) returns (bool) {</span>
+<span id="L370"><span class="lineNum">     370</span> <span class="tlaUNC tlaBgUNC">           0 :         require(</span></span>
+<span id="L371"><span class="lineNum">     371</span>              :             index &lt; _tokens.length &amp;&amp; _tokens[index] == token,</span>
+<span id="L372"><span class="lineNum">     372</span>              :             &quot;index into tokens list not mapped to token&quot;</span>
+<span id="L373"><span class="lineNum">     373</span>              :         );</span>
+<span id="L374"><span class="lineNum">     374</span> <span class="tlaUNC">           0 :         isToken[token] = false;</span></span>
+<span id="L375"><span class="lineNum">     375</span> <span class="tlaUNC">           0 :         address lastItem = _tokens[_tokens.length.sub(1)];</span></span>
+<span id="L376"><span class="lineNum">     376</span> <span class="tlaUNC">           0 :         _tokens[index] = lastItem;</span></span>
+<span id="L377"><span class="lineNum">     377</span> <span class="tlaUNC">           0 :         _tokens.length = _tokens.length.sub(1);</span></span>
+<span id="L378"><span class="lineNum">     378</span> <span class="tlaUNC">           0 :         emit TokenRemoved(token, index);</span></span>
+<span id="L379"><span class="lineNum">     379</span> <span class="tlaUNC">           0 :         return true;</span></span>
+<span id="L380"><span class="lineNum">     380</span>              :     }</span>
+<span id="L381"><span class="lineNum">     381</span>              : </span>
+<span id="L382"><span class="lineNum">     382</span>              :     /**</span>
+<span id="L383"><span class="lineNum">     383</span>              :      * @notice Add a reserve address whose balance shall be included in the reserve ratio.</span>
+<span id="L384"><span class="lineNum">     384</span>              :      * @param reserveAddress The reserve address to add.</span>
+<span id="L385"><span class="lineNum">     385</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L386"><span class="lineNum">     386</span>              :      */</span>
+<span id="L387"><span class="lineNum">     387</span>              :     function addOtherReserveAddress(</span>
+<span id="L388"><span class="lineNum">     388</span>              :         address reserveAddress</span>
+<span id="L389"><span class="lineNum">     389</span>              :     ) external onlyOwner returns (bool) {</span>
+<span id="L390"><span class="lineNum">     390</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L391"><span class="lineNum">     391</span>              :             !isOtherReserveAddress[reserveAddress],</span>
+<span id="L392"><span class="lineNum">     392</span>              :             &quot;reserve addr already added&quot;</span>
+<span id="L393"><span class="lineNum">     393</span>              :         );</span>
+<span id="L394"><span class="lineNum">     394</span> <span class="tlaUNC">           0 :         isOtherReserveAddress[reserveAddress] = true;</span></span>
+<span id="L395"><span class="lineNum">     395</span> <span class="tlaUNC">           0 :         otherReserveAddresses.push(reserveAddress);</span></span>
+<span id="L396"><span class="lineNum">     396</span> <span class="tlaUNC">           0 :         emit OtherReserveAddressAdded(reserveAddress);</span></span>
+<span id="L397"><span class="lineNum">     397</span> <span class="tlaUNC">           0 :         return true;</span></span>
+<span id="L398"><span class="lineNum">     398</span>              :     }</span>
+<span id="L399"><span class="lineNum">     399</span>              : </span>
+<span id="L400"><span class="lineNum">     400</span>              :     /**</span>
+<span id="L401"><span class="lineNum">     401</span>              :      * @notice Remove reserve address whose balance shall no longer be included in the reserve ratio.</span>
+<span id="L402"><span class="lineNum">     402</span>              :      * @param reserveAddress The reserve address to remove.</span>
+<span id="L403"><span class="lineNum">     403</span>              :      * @param index The index of the reserve address in otherReserveAddresses.</span>
+<span id="L404"><span class="lineNum">     404</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L405"><span class="lineNum">     405</span>              :      */</span>
+<span id="L406"><span class="lineNum">     406</span>              :     function removeOtherReserveAddress(</span>
+<span id="L407"><span class="lineNum">     407</span>              :         address reserveAddress,</span>
+<span id="L408"><span class="lineNum">     408</span>              :         uint256 index</span>
+<span id="L409"><span class="lineNum">     409</span>              :     ) external onlyOwner returns (bool) {</span>
+<span id="L410"><span class="lineNum">     410</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L411"><span class="lineNum">     411</span>              :             isOtherReserveAddress[reserveAddress],</span>
+<span id="L412"><span class="lineNum">     412</span>              :             &quot;reserve addr was never added&quot;</span>
+<span id="L413"><span class="lineNum">     413</span>              :         );</span>
+<span id="L414"><span class="lineNum">     414</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L415"><span class="lineNum">     415</span>              :             index &lt; otherReserveAddresses.length &amp;&amp;</span>
+<span id="L416"><span class="lineNum">     416</span>              :                 otherReserveAddresses[index] == reserveAddress,</span>
+<span id="L417"><span class="lineNum">     417</span>              :             &quot;index into reserve list not mapped to address&quot;</span>
+<span id="L418"><span class="lineNum">     418</span>              :         );</span>
+<span id="L419"><span class="lineNum">     419</span> <span class="tlaUNC">           0 :         isOtherReserveAddress[reserveAddress] = false;</span></span>
+<span id="L420"><span class="lineNum">     420</span> <span class="tlaUNC">           0 :         address lastItem = otherReserveAddresses[</span></span>
+<span id="L421"><span class="lineNum">     421</span>              :             otherReserveAddresses.length.sub(1)</span>
+<span id="L422"><span class="lineNum">     422</span>              :         ];</span>
+<span id="L423"><span class="lineNum">     423</span> <span class="tlaUNC">           0 :         otherReserveAddresses[index] = lastItem;</span></span>
+<span id="L424"><span class="lineNum">     424</span> <span class="tlaUNC">           0 :         otherReserveAddresses.length = otherReserveAddresses.length.sub(1);</span></span>
+<span id="L425"><span class="lineNum">     425</span> <span class="tlaUNC">           0 :         emit OtherReserveAddressRemoved(reserveAddress, index);</span></span>
+<span id="L426"><span class="lineNum">     426</span> <span class="tlaUNC">           0 :         return true;</span></span>
+<span id="L427"><span class="lineNum">     427</span>              :     }</span>
+<span id="L428"><span class="lineNum">     428</span>              : </span>
+<span id="L429"><span class="lineNum">     429</span>              :     /**</span>
+<span id="L430"><span class="lineNum">     430</span>              :      * @notice Gives an address permission to spend Reserve funds.</span>
+<span id="L431"><span class="lineNum">     431</span>              :      * @param spender The address that is allowed to spend Reserve funds.</span>
+<span id="L432"><span class="lineNum">     432</span>              :      */</span>
+<span id="L433"><span class="lineNum">     433</span>              :     function addSpender(address spender) external onlyOwner {</span>
+<span id="L434"><span class="lineNum">     434</span> <span class="tlaUNC">           0 :         require(address(0) != spender, &quot;Spender can't be null&quot;);</span></span>
+<span id="L435"><span class="lineNum">     435</span> <span class="tlaUNC">           0 :         isSpender[spender] = true;</span></span>
+<span id="L436"><span class="lineNum">     436</span> <span class="tlaUNC">           0 :         emit SpenderAdded(spender);</span></span>
+<span id="L437"><span class="lineNum">     437</span>              :     }</span>
+<span id="L438"><span class="lineNum">     438</span>              : </span>
+<span id="L439"><span class="lineNum">     439</span>              :     /**</span>
+<span id="L440"><span class="lineNum">     440</span>              :      * @notice Takes away an address's permission to spend Reserve funds.</span>
+<span id="L441"><span class="lineNum">     441</span>              :      * @param spender The address that is to be no longer allowed to spend Reserve funds.</span>
+<span id="L442"><span class="lineNum">     442</span>              :      */</span>
+<span id="L443"><span class="lineNum">     443</span>              :     function removeSpender(address spender) external onlyOwner {</span>
+<span id="L444"><span class="lineNum">     444</span> <span class="tlaUNC">           0 :         require(isSpender[spender], &quot;Spender hasn't been added&quot;);</span></span>
+<span id="L445"><span class="lineNum">     445</span> <span class="tlaUNC">           0 :         isSpender[spender] = false;</span></span>
+<span id="L446"><span class="lineNum">     446</span> <span class="tlaUNC">           0 :         emit SpenderRemoved(spender);</span></span>
+<span id="L447"><span class="lineNum">     447</span>              :     }</span>
+<span id="L448"><span class="lineNum">     448</span>              : </span>
+<span id="L449"><span class="lineNum">     449</span>              :     /**</span>
+<span id="L450"><span class="lineNum">     450</span>              :      * @notice Checks if an address is able to spend as an exchange.</span>
+<span id="L451"><span class="lineNum">     451</span>              :      * @dev isExchangeSpender was introduced after cUSD, so the cUSD Exchange is not included in it.</span>
+<span id="L452"><span class="lineNum">     452</span>              :      * If cUSD's Exchange were to be added to isExchangeSpender, the check with the</span>
+<span id="L453"><span class="lineNum">     453</span>              :      * registry could be removed.</span>
+<span id="L454"><span class="lineNum">     454</span>              :      * @param spender The address to be checked.</span>
+<span id="L455"><span class="lineNum">     455</span>              :      */</span>
+<span id="L456"><span class="lineNum">     456</span>              :     modifier isAllowedToSpendExchange(address spender) {</span>
+<span id="L457"><span class="lineNum">     457</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L458"><span class="lineNum">     458</span>              :             isExchangeSpender[spender] ||</span>
+<span id="L459"><span class="lineNum">     459</span>              :                 (registry.getAddressForOrDie(EXCHANGE_REGISTRY_ID) == spender),</span>
+<span id="L460"><span class="lineNum">     460</span>              :             &quot;Address not allowed to spend&quot;</span>
+<span id="L461"><span class="lineNum">     461</span>              :         );</span>
+<span id="L462"><span class="lineNum">     462</span>              :         _;</span>
+<span id="L463"><span class="lineNum">     463</span>              :     }</span>
+<span id="L464"><span class="lineNum">     464</span>              : </span>
+<span id="L465"><span class="lineNum">     465</span>              :     /**</span>
+<span id="L466"><span class="lineNum">     466</span>              :      * @notice Gives an address permission to spend Reserve without limit.</span>
+<span id="L467"><span class="lineNum">     467</span>              :      * @param spender The address that is allowed to spend Reserve funds.</span>
+<span id="L468"><span class="lineNum">     468</span>              :      */</span>
+<span id="L469"><span class="lineNum">     469</span>              :     function addExchangeSpender(address spender) external onlyOwner {</span>
+<span id="L470"><span class="lineNum">     470</span> <span class="tlaGNC tlaBgGNC">           6 :         require(address(0) != spender, &quot;Spender can't be null&quot;);</span></span>
+<span id="L471"><span class="lineNum">     471</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L472"><span class="lineNum">     472</span>              :             !isExchangeSpender[spender],</span>
+<span id="L473"><span class="lineNum">     473</span>              :             &quot;Address is already Exchange Spender&quot;</span>
+<span id="L474"><span class="lineNum">     474</span>              :         );</span>
+<span id="L475"><span class="lineNum">     475</span> <span class="tlaGNC">           6 :         isExchangeSpender[spender] = true;</span></span>
+<span id="L476"><span class="lineNum">     476</span> <span class="tlaGNC">           6 :         exchangeSpenderAddresses.push(spender);</span></span>
+<span id="L477"><span class="lineNum">     477</span> <span class="tlaGNC">           6 :         emit ExchangeSpenderAdded(spender);</span></span>
+<span id="L478"><span class="lineNum">     478</span>              :     }</span>
+<span id="L479"><span class="lineNum">     479</span>              : </span>
+<span id="L480"><span class="lineNum">     480</span>              :     /**</span>
+<span id="L481"><span class="lineNum">     481</span>              :      * @notice Takes away an address's permission to spend Reserve funds without limits.</span>
+<span id="L482"><span class="lineNum">     482</span>              :      * @param spender The address that is to be no longer allowed to spend Reserve funds.</span>
+<span id="L483"><span class="lineNum">     483</span>              :      * @param index The index in exchangeSpenderAddresses of spender.</span>
+<span id="L484"><span class="lineNum">     484</span>              :      */</span>
+<span id="L485"><span class="lineNum">     485</span>              :     function removeExchangeSpender(</span>
+<span id="L486"><span class="lineNum">     486</span>              :         address spender,</span>
+<span id="L487"><span class="lineNum">     487</span>              :         uint256 index</span>
+<span id="L488"><span class="lineNum">     488</span>              :     ) external onlyOwner {</span>
+<span id="L489"><span class="lineNum">     489</span> <span class="tlaUNC tlaBgUNC">           0 :         isExchangeSpender[spender] = false;</span></span>
+<span id="L490"><span class="lineNum">     490</span> <span class="tlaUNC">           0 :         uint256 numAddresses = exchangeSpenderAddresses.length;</span></span>
+<span id="L491"><span class="lineNum">     491</span> <span class="tlaUNC">           0 :         require(index &lt; numAddresses, &quot;Index is invalid&quot;);</span></span>
+<span id="L492"><span class="lineNum">     492</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L493"><span class="lineNum">     493</span>              :             spender == exchangeSpenderAddresses[index],</span>
+<span id="L494"><span class="lineNum">     494</span>              :             &quot;Index does not match spender&quot;</span>
+<span id="L495"><span class="lineNum">     495</span>              :         );</span>
+<span id="L496"><span class="lineNum">     496</span> <span class="tlaUNC">           0 :         uint256 newNumAddresses = numAddresses.sub(1);</span></span>
+<span id="L497"><span class="lineNum">     497</span>              : </span>
+<span id="L498"><span class="lineNum">     498</span> <span class="tlaUNC">           0 :         if (index != newNumAddresses) {</span></span>
+<span id="L499"><span class="lineNum">     499</span> <span class="tlaUNC">           0 :             exchangeSpenderAddresses[index] = exchangeSpenderAddresses[</span></span>
+<span id="L500"><span class="lineNum">     500</span>              :                 newNumAddresses</span>
+<span id="L501"><span class="lineNum">     501</span>              :             ];</span>
+<span id="L502"><span class="lineNum">     502</span>              :         }</span>
+<span id="L503"><span class="lineNum">     503</span>              : </span>
+<span id="L504"><span class="lineNum">     504</span> <span class="tlaUNC">           0 :         exchangeSpenderAddresses[newNumAddresses] = address(0x0);</span></span>
+<span id="L505"><span class="lineNum">     505</span> <span class="tlaUNC">           0 :         exchangeSpenderAddresses.length = newNumAddresses;</span></span>
+<span id="L506"><span class="lineNum">     506</span> <span class="tlaUNC">           0 :         emit ExchangeSpenderRemoved(spender);</span></span>
+<span id="L507"><span class="lineNum">     507</span>              :     }</span>
+<span id="L508"><span class="lineNum">     508</span>              : </span>
+<span id="L509"><span class="lineNum">     509</span>              :     /**</span>
+<span id="L510"><span class="lineNum">     510</span>              :      * @notice Returns addresses of exchanges permitted to spend Reserve funds.</span>
+<span id="L511"><span class="lineNum">     511</span>              :      * Because exchangeSpenderAddresses was introduced after cUSD, cUSD's exchange</span>
+<span id="L512"><span class="lineNum">     512</span>              :      * is not included in this list.</span>
+<span id="L513"><span class="lineNum">     513</span>              :      * @return An array of addresses permitted to spend Reserve funds.</span>
+<span id="L514"><span class="lineNum">     514</span>              :      */</span>
+<span id="L515"><span class="lineNum">     515</span>              :     function getExchangeSpenders() external view returns (address[] memory) {</span>
+<span id="L516"><span class="lineNum">     516</span> <span class="tlaUNC">           0 :         return exchangeSpenderAddresses;</span></span>
+<span id="L517"><span class="lineNum">     517</span>              :     }</span>
+<span id="L518"><span class="lineNum">     518</span>              : </span>
+<span id="L519"><span class="lineNum">     519</span>              :     /**</span>
+<span id="L520"><span class="lineNum">     520</span>              :      * @notice Transfer gold to a whitelisted address subject to reserve spending limits.</span>
+<span id="L521"><span class="lineNum">     521</span>              :      * @param to The address that will receive the gold.</span>
+<span id="L522"><span class="lineNum">     522</span>              :      * @param value The amount of gold to transfer.</span>
+<span id="L523"><span class="lineNum">     523</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L524"><span class="lineNum">     524</span>              :      */</span>
+<span id="L525"><span class="lineNum">     525</span>              :     function transferGold(</span>
+<span id="L526"><span class="lineNum">     526</span>              :         address payable to,</span>
+<span id="L527"><span class="lineNum">     527</span>              :         uint256 value</span>
+<span id="L528"><span class="lineNum">     528</span>              :     ) external returns (bool) {</span>
+<span id="L529"><span class="lineNum">     529</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L530"><span class="lineNum">     530</span>              :             isSpender[msg.sender],</span>
+<span id="L531"><span class="lineNum">     531</span>              :             &quot;sender not allowed to transfer Reserve funds&quot;</span>
+<span id="L532"><span class="lineNum">     532</span>              :         );</span>
+<span id="L533"><span class="lineNum">     533</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L534"><span class="lineNum">     534</span>              :             isOtherReserveAddress[to],</span>
+<span id="L535"><span class="lineNum">     535</span>              :             &quot;can only transfer to other reserve address&quot;</span>
+<span id="L536"><span class="lineNum">     536</span>              :         );</span>
+<span id="L537"><span class="lineNum">     537</span> <span class="tlaUNC">           0 :         uint256 currentDay = now / 1 days;</span></span>
+<span id="L538"><span class="lineNum">     538</span> <span class="tlaUNC">           0 :         if (currentDay &gt; lastSpendingDay) {</span></span>
+<span id="L539"><span class="lineNum">     539</span> <span class="tlaUNC">           0 :             uint256 balance = getUnfrozenReserveGoldBalance();</span></span>
+<span id="L540"><span class="lineNum">     540</span> <span class="tlaUNC">           0 :             lastSpendingDay = currentDay;</span></span>
+<span id="L541"><span class="lineNum">     541</span> <span class="tlaUNC">           0 :             spendingLimit = spendingRatio</span></span>
+<span id="L542"><span class="lineNum">     542</span>              :                 .multiply(FixidityLib.newFixed(balance))</span>
+<span id="L543"><span class="lineNum">     543</span>              :                 .fromFixed();</span>
+<span id="L544"><span class="lineNum">     544</span>              :         }</span>
+<span id="L545"><span class="lineNum">     545</span> <span class="tlaUNC">           0 :         require(spendingLimit &gt;= value, &quot;Exceeding spending limit&quot;);</span></span>
+<span id="L546"><span class="lineNum">     546</span> <span class="tlaUNC">           0 :         spendingLimit = spendingLimit.sub(value);</span></span>
+<span id="L547"><span class="lineNum">     547</span> <span class="tlaUNC">           0 :         return _transferGold(to, value);</span></span>
+<span id="L548"><span class="lineNum">     548</span>              :     }</span>
+<span id="L549"><span class="lineNum">     549</span>              : </span>
+<span id="L550"><span class="lineNum">     550</span>              :     /**</span>
+<span id="L551"><span class="lineNum">     551</span>              :      * @notice Transfer collateral asset subject to reserve spending limits to the trader,</span>
+<span id="L552"><span class="lineNum">     552</span>              :      * if the limit is set, othersise the limit is 100%.</span>
+<span id="L553"><span class="lineNum">     553</span>              :      * @param collateralAsset The token address you're transferring.</span>
+<span id="L554"><span class="lineNum">     554</span>              :      * @param to The address that will receive the funds.</span>
+<span id="L555"><span class="lineNum">     555</span>              :      * @param value The amount of collateral assets to transfer.</span>
+<span id="L556"><span class="lineNum">     556</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L557"><span class="lineNum">     557</span>              :      */</span>
+<span id="L558"><span class="lineNum">     558</span>              :     function transferCollateralAsset(</span>
+<span id="L559"><span class="lineNum">     559</span>              :         address collateralAsset,</span>
+<span id="L560"><span class="lineNum">     560</span>              :         address payable to,</span>
+<span id="L561"><span class="lineNum">     561</span>              :         uint256 value</span>
+<span id="L562"><span class="lineNum">     562</span>              :     ) external returns (bool) {</span>
+<span id="L563"><span class="lineNum">     563</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L564"><span class="lineNum">     564</span>              :             isSpender[msg.sender],</span>
+<span id="L565"><span class="lineNum">     565</span>              :             &quot;sender not allowed to transfer Reserve funds&quot;</span>
+<span id="L566"><span class="lineNum">     566</span>              :         );</span>
+<span id="L567"><span class="lineNum">     567</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L568"><span class="lineNum">     568</span>              :             isOtherReserveAddress[to],</span>
+<span id="L569"><span class="lineNum">     569</span>              :             &quot;can only transfer to other reserve address&quot;</span>
+<span id="L570"><span class="lineNum">     570</span>              :         );</span>
+<span id="L571"><span class="lineNum">     571</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L572"><span class="lineNum">     572</span>              :             getDailySpendingRatioForCollateralAsset(collateralAsset) &gt; 0,</span>
+<span id="L573"><span class="lineNum">     573</span>              :             &quot;this asset has no spending ratio, therefore can't be transferred&quot;</span>
+<span id="L574"><span class="lineNum">     574</span>              :         );</span>
+<span id="L575"><span class="lineNum">     575</span> <span class="tlaUNC">           0 :         uint256 currentDay = now / 1 days;</span></span>
+<span id="L576"><span class="lineNum">     576</span> <span class="tlaUNC">           0 :         if (currentDay &gt; collateralAssetLastSpendingDay[collateralAsset]) {</span></span>
+<span id="L577"><span class="lineNum">     577</span> <span class="tlaUNC">           0 :             uint256 balance = getReserveAddressesCollateralAssetBalance(</span></span>
+<span id="L578"><span class="lineNum">     578</span>              :                 collateralAsset</span>
+<span id="L579"><span class="lineNum">     579</span>              :             );</span>
+<span id="L580"><span class="lineNum">     580</span> <span class="tlaUNC">           0 :             collateralAssetLastSpendingDay[collateralAsset] = currentDay;</span></span>
+<span id="L581"><span class="lineNum">     581</span> <span class="tlaUNC">           0 :             collateralAssetSpendingLimit[</span></span>
+<span id="L582"><span class="lineNum">     582</span>              :                 collateralAsset</span>
+<span id="L583"><span class="lineNum">     583</span>              :             ] = collateralAssetDailySpendingRatio[collateralAsset]</span>
+<span id="L584"><span class="lineNum">     584</span>              :                 .multiply(FixidityLib.newFixed(balance))</span>
+<span id="L585"><span class="lineNum">     585</span>              :                 .fromFixed();</span>
+<span id="L586"><span class="lineNum">     586</span>              :         }</span>
+<span id="L587"><span class="lineNum">     587</span> <span class="tlaUNC">           0 :         uint256 spendingLimitForThisAsset = collateralAssetSpendingLimit[</span></span>
+<span id="L588"><span class="lineNum">     588</span>              :             collateralAsset</span>
+<span id="L589"><span class="lineNum">     589</span>              :         ];</span>
+<span id="L590"><span class="lineNum">     590</span> <span class="tlaUNC">           0 :         require(spendingLimitForThisAsset &gt;= value, &quot;Exceeding spending limit&quot;);</span></span>
+<span id="L591"><span class="lineNum">     591</span>              : </span>
+<span id="L592"><span class="lineNum">     592</span> <span class="tlaUNC">           0 :         collateralAssetSpendingLimit[</span></span>
+<span id="L593"><span class="lineNum">     593</span>              :             collateralAsset</span>
+<span id="L594"><span class="lineNum">     594</span>              :         ] = spendingLimitForThisAsset.sub(value);</span>
+<span id="L595"><span class="lineNum">     595</span> <span class="tlaUNC">           0 :         return _transferCollateralAsset(collateralAsset, to, value);</span></span>
+<span id="L596"><span class="lineNum">     596</span>              :     }</span>
+<span id="L597"><span class="lineNum">     597</span>              : </span>
+<span id="L598"><span class="lineNum">     598</span>              :     /**</span>
+<span id="L599"><span class="lineNum">     599</span>              :      * @notice Transfer collateral asset to any address.</span>
+<span id="L600"><span class="lineNum">     600</span>              :      * @param collateralAsset The token address you're transferring.</span>
+<span id="L601"><span class="lineNum">     601</span>              :      * @param to The address that will receive the funds.</span>
+<span id="L602"><span class="lineNum">     602</span>              :      * @param value The amount of collateral assets to transfer.</span>
+<span id="L603"><span class="lineNum">     603</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L604"><span class="lineNum">     604</span>              :      */</span>
+<span id="L605"><span class="lineNum">     605</span>              :     function _transferCollateralAsset(</span>
+<span id="L606"><span class="lineNum">     606</span>              :         address collateralAsset,</span>
+<span id="L607"><span class="lineNum">     607</span>              :         address payable to,</span>
+<span id="L608"><span class="lineNum">     608</span>              :         uint256 value</span>
+<span id="L609"><span class="lineNum">     609</span>              :     ) internal returns (bool) {</span>
+<span id="L610"><span class="lineNum">     610</span> <span class="tlaGNC tlaBgGNC">           2 :         require(</span></span>
+<span id="L611"><span class="lineNum">     611</span>              :             value &lt;= getReserveAddressesCollateralAssetBalance(collateralAsset),</span>
+<span id="L612"><span class="lineNum">     612</span>              :             &quot;Exceeding the amount reserve holds&quot;</span>
+<span id="L613"><span class="lineNum">     613</span>              :         );</span>
+<span id="L614"><span class="lineNum">     614</span>              :         // slither-disable-next-line reentrancy-events</span>
+<span id="L615"><span class="lineNum">     615</span> <span class="tlaGNC">           2 :         IERC20(collateralAsset).safeTransfer(to, value);</span></span>
+<span id="L616"><span class="lineNum">     616</span> <span class="tlaGNC">           2 :         emit ReserveCollateralAssetsTransferred(</span></span>
+<span id="L617"><span class="lineNum">     617</span>              :             msg.sender,</span>
+<span id="L618"><span class="lineNum">     618</span>              :             to,</span>
+<span id="L619"><span class="lineNum">     619</span>              :             value,</span>
+<span id="L620"><span class="lineNum">     620</span>              :             collateralAsset</span>
+<span id="L621"><span class="lineNum">     621</span>              :         );</span>
+<span id="L622"><span class="lineNum">     622</span> <span class="tlaGNC">           2 :         return true;</span></span>
+<span id="L623"><span class="lineNum">     623</span>              :     }</span>
+<span id="L624"><span class="lineNum">     624</span>              : </span>
+<span id="L625"><span class="lineNum">     625</span>              :     /**</span>
+<span id="L626"><span class="lineNum">     626</span>              :      * @notice Transfer collateral asset to any address.</span>
+<span id="L627"><span class="lineNum">     627</span>              :      * @dev Transfers are not subject to a daily spending limit.</span>
+<span id="L628"><span class="lineNum">     628</span>              :      * @param collateralAsset The address of collateral asset being transferred.</span>
+<span id="L629"><span class="lineNum">     629</span>              :      * @param to The address that will receive the collateral asset.</span>
+<span id="L630"><span class="lineNum">     630</span>              :      * @param value The amount of collateral asset to transfer.</span>
+<span id="L631"><span class="lineNum">     631</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L632"><span class="lineNum">     632</span>              :      */</span>
+<span id="L633"><span class="lineNum">     633</span>              :     function transferExchangeCollateralAsset(</span>
+<span id="L634"><span class="lineNum">     634</span>              :         address collateralAsset,</span>
+<span id="L635"><span class="lineNum">     635</span>              :         address payable to,</span>
+<span id="L636"><span class="lineNum">     636</span>              :         uint256 value</span>
+<span id="L637"><span class="lineNum">     637</span>              :     ) external returns (bool) {</span>
+<span id="L638"><span class="lineNum">     638</span> <span class="tlaGNC">           2 :         require(isExchangeSpender[msg.sender], &quot;Address not allowed to spend&quot;);</span></span>
+<span id="L639"><span class="lineNum">     639</span> <span class="tlaGNC">           2 :         return _transferCollateralAsset(collateralAsset, to, value);</span></span>
+<span id="L640"><span class="lineNum">     640</span>              :     }</span>
+<span id="L641"><span class="lineNum">     641</span>              : </span>
+<span id="L642"><span class="lineNum">     642</span>              :     /**</span>
+<span id="L643"><span class="lineNum">     643</span>              :      * @notice Transfer unfrozen gold to any address.</span>
+<span id="L644"><span class="lineNum">     644</span>              :      * @param to The address that will receive the gold.</span>
+<span id="L645"><span class="lineNum">     645</span>              :      * @param value The amount of gold to transfer.</span>
+<span id="L646"><span class="lineNum">     646</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L647"><span class="lineNum">     647</span>              :      */</span>
+<span id="L648"><span class="lineNum">     648</span>              :     function _transferGold(</span>
+<span id="L649"><span class="lineNum">     649</span>              :         address payable to,</span>
+<span id="L650"><span class="lineNum">     650</span>              :         uint256 value</span>
+<span id="L651"><span class="lineNum">     651</span>              :     ) internal returns (bool) {</span>
+<span id="L652"><span class="lineNum">     652</span> <span class="tlaUNC tlaBgUNC">           0 :         require(value &lt;= getUnfrozenBalance(), &quot;Exceeding unfrozen reserves&quot;);</span></span>
+<span id="L653"><span class="lineNum">     653</span>              :         // slither-disable-next-line reentrancy-events</span>
+<span id="L654"><span class="lineNum">     654</span> <span class="tlaUNC">           0 :         to.sendValue(value);</span></span>
+<span id="L655"><span class="lineNum">     655</span> <span class="tlaUNC">           0 :         emit ReserveGoldTransferred(msg.sender, to, value);</span></span>
+<span id="L656"><span class="lineNum">     656</span> <span class="tlaUNC">           0 :         return true;</span></span>
+<span id="L657"><span class="lineNum">     657</span>              :     }</span>
+<span id="L658"><span class="lineNum">     658</span>              : </span>
+<span id="L659"><span class="lineNum">     659</span>              :     /**</span>
+<span id="L660"><span class="lineNum">     660</span>              :      * @notice Transfer unfrozen gold to any address, used for one side of CP-DOTO.</span>
+<span id="L661"><span class="lineNum">     661</span>              :      * @dev Transfers are not subject to a daily spending limit.</span>
+<span id="L662"><span class="lineNum">     662</span>              :      * @param to The address that will receive the gold.</span>
+<span id="L663"><span class="lineNum">     663</span>              :      * @param value The amount of gold to transfer.</span>
+<span id="L664"><span class="lineNum">     664</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L665"><span class="lineNum">     665</span>              :      */</span>
+<span id="L666"><span class="lineNum">     666</span>              :     function transferExchangeGold(</span>
+<span id="L667"><span class="lineNum">     667</span>              :         address payable to,</span>
+<span id="L668"><span class="lineNum">     668</span>              :         uint256 value</span>
+<span id="L669"><span class="lineNum">     669</span>              :     ) external isAllowedToSpendExchange(msg.sender) returns (bool) {</span>
+<span id="L670"><span class="lineNum">     670</span> <span class="tlaUNC">           0 :         return _transferGold(to, value);</span></span>
+<span id="L671"><span class="lineNum">     671</span>              :     }</span>
+<span id="L672"><span class="lineNum">     672</span>              : </span>
+<span id="L673"><span class="lineNum">     673</span>              :     /**</span>
+<span id="L674"><span class="lineNum">     674</span>              :      * @notice Returns the tobin tax, recomputing it if it's stale.</span>
+<span id="L675"><span class="lineNum">     675</span>              :      * @return The numerator - tobin tax amount as a fraction.</span>
+<span id="L676"><span class="lineNum">     676</span>              :      * @return The denominator - tobin tax amount as a fraction.</span>
+<span id="L677"><span class="lineNum">     677</span>              :      */</span>
+<span id="L678"><span class="lineNum">     678</span>              :     function getOrComputeTobinTax()</span>
+<span id="L679"><span class="lineNum">     679</span>              :         external</span>
+<span id="L680"><span class="lineNum">     680</span>              :         nonReentrant</span>
+<span id="L681"><span class="lineNum">     681</span>              :         returns (uint256, uint256)</span>
+<span id="L682"><span class="lineNum">     682</span>              :     {</span>
+<span id="L683"><span class="lineNum">     683</span>              :         // solhint-disable-next-line not-rely-on-time</span>
+<span id="L684"><span class="lineNum">     684</span> <span class="tlaUNC">           0 :         if (now.sub(tobinTaxCache.timestamp) &gt; tobinTaxStalenessThreshold) {</span></span>
+<span id="L685"><span class="lineNum">     685</span> <span class="tlaUNC">           0 :             tobinTaxCache.numerator = uint128(computeTobinTax().unwrap());</span></span>
+<span id="L686"><span class="lineNum">     686</span> <span class="tlaUNC">           0 :             tobinTaxCache.timestamp = uint128(now); // solhint-disable-line not-rely-on-time</span></span>
+<span id="L687"><span class="lineNum">     687</span>              :         }</span>
+<span id="L688"><span class="lineNum">     688</span> <span class="tlaUNC">           0 :         return (</span></span>
+<span id="L689"><span class="lineNum">     689</span>              :             uint256(tobinTaxCache.numerator),</span>
+<span id="L690"><span class="lineNum">     690</span>              :             FixidityLib.fixed1().unwrap()</span>
+<span id="L691"><span class="lineNum">     691</span>              :         );</span>
+<span id="L692"><span class="lineNum">     692</span>              :     }</span>
+<span id="L693"><span class="lineNum">     693</span>              : </span>
+<span id="L694"><span class="lineNum">     694</span>              :     /**</span>
+<span id="L695"><span class="lineNum">     695</span>              :      * @notice Returns the list of stabilized token addresses.</span>
+<span id="L696"><span class="lineNum">     696</span>              :      * @return An array of addresses of stabilized tokens.</span>
+<span id="L697"><span class="lineNum">     697</span>              :      */</span>
+<span id="L698"><span class="lineNum">     698</span>              :     function getTokens() external view returns (address[] memory) {</span>
+<span id="L699"><span class="lineNum">     699</span> <span class="tlaUNC">           0 :         return _tokens;</span></span>
+<span id="L700"><span class="lineNum">     700</span>              :     }</span>
+<span id="L701"><span class="lineNum">     701</span>              : </span>
+<span id="L702"><span class="lineNum">     702</span>              :     /**</span>
+<span id="L703"><span class="lineNum">     703</span>              :      * @notice Returns the list other addresses included in the reserve total.</span>
+<span id="L704"><span class="lineNum">     704</span>              :      * @return An array of other addresses included in the reserve total.</span>
+<span id="L705"><span class="lineNum">     705</span>              :      */</span>
+<span id="L706"><span class="lineNum">     706</span>              :     function getOtherReserveAddresses()</span>
+<span id="L707"><span class="lineNum">     707</span>              :         external</span>
+<span id="L708"><span class="lineNum">     708</span>              :         view</span>
+<span id="L709"><span class="lineNum">     709</span>              :         returns (address[] memory)</span>
+<span id="L710"><span class="lineNum">     710</span>              :     {</span>
+<span id="L711"><span class="lineNum">     711</span> <span class="tlaUNC">           0 :         return otherReserveAddresses;</span></span>
+<span id="L712"><span class="lineNum">     712</span>              :     }</span>
+<span id="L713"><span class="lineNum">     713</span>              : </span>
+<span id="L714"><span class="lineNum">     714</span>              :     /**</span>
+<span id="L715"><span class="lineNum">     715</span>              :      * @notice Returns a list of token symbols that have been allocated.</span>
+<span id="L716"><span class="lineNum">     716</span>              :      * @return An array of token symbols that have been allocated.</span>
+<span id="L717"><span class="lineNum">     717</span>              :      */</span>
+<span id="L718"><span class="lineNum">     718</span>              :     function getAssetAllocationSymbols()</span>
+<span id="L719"><span class="lineNum">     719</span>              :         external</span>
+<span id="L720"><span class="lineNum">     720</span>              :         view</span>
+<span id="L721"><span class="lineNum">     721</span>              :         returns (bytes32[] memory)</span>
+<span id="L722"><span class="lineNum">     722</span>              :     {</span>
+<span id="L723"><span class="lineNum">     723</span> <span class="tlaUNC">           0 :         return assetAllocationSymbols;</span></span>
+<span id="L724"><span class="lineNum">     724</span>              :     }</span>
+<span id="L725"><span class="lineNum">     725</span>              : </span>
+<span id="L726"><span class="lineNum">     726</span>              :     /**</span>
+<span id="L727"><span class="lineNum">     727</span>              :      * @notice Returns a list of weights used for the allocation of reserve assets.</span>
+<span id="L728"><span class="lineNum">     728</span>              :      * @return An array of a list of weights used for the allocation of reserve assets.</span>
+<span id="L729"><span class="lineNum">     729</span>              :      */</span>
+<span id="L730"><span class="lineNum">     730</span>              :     function getAssetAllocationWeights()</span>
+<span id="L731"><span class="lineNum">     731</span>              :         external</span>
+<span id="L732"><span class="lineNum">     732</span>              :         view</span>
+<span id="L733"><span class="lineNum">     733</span>              :         returns (uint256[] memory)</span>
+<span id="L734"><span class="lineNum">     734</span>              :     {</span>
+<span id="L735"><span class="lineNum">     735</span> <span class="tlaUNC">           0 :         uint256[] memory weights = new uint256[](assetAllocationSymbols.length);</span></span>
+<span id="L736"><span class="lineNum">     736</span>              :         // slither-disable-next-line cache-array-length</span>
+<span id="L737"><span class="lineNum">     737</span> <span class="tlaUNC">           0 :         for (uint256 i = 0; i &lt; assetAllocationSymbols.length; i = i.add(1)) {</span></span>
+<span id="L738"><span class="lineNum">     738</span> <span class="tlaUNC">           0 :             weights[i] = assetAllocationWeights[assetAllocationSymbols[i]];</span></span>
+<span id="L739"><span class="lineNum">     739</span>              :         }</span>
+<span id="L740"><span class="lineNum">     740</span> <span class="tlaUNC">           0 :         return weights;</span></span>
+<span id="L741"><span class="lineNum">     741</span>              :     }</span>
+<span id="L742"><span class="lineNum">     742</span>              : </span>
+<span id="L743"><span class="lineNum">     743</span>              :     /**</span>
+<span id="L744"><span class="lineNum">     744</span>              :      * @notice Returns the amount of unfrozen CELO in the reserve.</span>
+<span id="L745"><span class="lineNum">     745</span>              :      * @return The total unfrozen CELO in the reserve.</span>
+<span id="L746"><span class="lineNum">     746</span>              :      */</span>
+<span id="L747"><span class="lineNum">     747</span>              :     function getUnfrozenBalance() public view returns (uint256) {</span>
+<span id="L748"><span class="lineNum">     748</span> <span class="tlaUNC">           0 :         uint256 balance = address(this).balance;</span></span>
+<span id="L749"><span class="lineNum">     749</span> <span class="tlaUNC">           0 :         uint256 frozenReserveGold = getFrozenReserveGoldBalance();</span></span>
+<span id="L750"><span class="lineNum">     750</span> <span class="tlaUNC">           0 :         return balance &gt; frozenReserveGold ? balance.sub(frozenReserveGold) : 0;</span></span>
+<span id="L751"><span class="lineNum">     751</span>              :     }</span>
+<span id="L752"><span class="lineNum">     752</span>              : </span>
+<span id="L753"><span class="lineNum">     753</span>              :     /**</span>
+<span id="L754"><span class="lineNum">     754</span>              :      * @notice Returns the amount of CELO included in the reserve.</span>
+<span id="L755"><span class="lineNum">     755</span>              :      * @return The CELO amount included in the reserve.</span>
+<span id="L756"><span class="lineNum">     756</span>              :      */</span>
+<span id="L757"><span class="lineNum">     757</span>              :     function getReserveGoldBalance() public view returns (uint256) {</span>
+<span id="L758"><span class="lineNum">     758</span> <span class="tlaUNC">           0 :         return address(this).balance.add(getOtherReserveAddressesGoldBalance());</span></span>
+<span id="L759"><span class="lineNum">     759</span>              :     }</span>
+<span id="L760"><span class="lineNum">     760</span>              : </span>
+<span id="L761"><span class="lineNum">     761</span>              :     /**</span>
+<span id="L762"><span class="lineNum">     762</span>              :      * @notice Returns the amount of CELO included in other reserve addresses.</span>
+<span id="L763"><span class="lineNum">     763</span>              :      * @return The CELO amount included in other reserve addresses.</span>
+<span id="L764"><span class="lineNum">     764</span>              :      */</span>
+<span id="L765"><span class="lineNum">     765</span>              :     function getOtherReserveAddressesGoldBalance()</span>
+<span id="L766"><span class="lineNum">     766</span>              :         public</span>
+<span id="L767"><span class="lineNum">     767</span>              :         view</span>
+<span id="L768"><span class="lineNum">     768</span>              :         returns (uint256)</span>
+<span id="L769"><span class="lineNum">     769</span>              :     {</span>
+<span id="L770"><span class="lineNum">     770</span> <span class="tlaUNC">           0 :         uint256 reserveGoldBalance = 0;</span></span>
+<span id="L771"><span class="lineNum">     771</span>              :         // slither-disable-next-line cache-array-length</span>
+<span id="L772"><span class="lineNum">     772</span> <span class="tlaUNC">           0 :         for (uint256 i = 0; i &lt; otherReserveAddresses.length; i = i.add(1)) {</span></span>
+<span id="L773"><span class="lineNum">     773</span> <span class="tlaUNC">           0 :             reserveGoldBalance = reserveGoldBalance.add(</span></span>
+<span id="L774"><span class="lineNum">     774</span>              :                 otherReserveAddresses[i].balance</span>
+<span id="L775"><span class="lineNum">     775</span>              :             );</span>
+<span id="L776"><span class="lineNum">     776</span>              :         }</span>
+<span id="L777"><span class="lineNum">     777</span> <span class="tlaUNC">           0 :         return reserveGoldBalance;</span></span>
+<span id="L778"><span class="lineNum">     778</span>              :     }</span>
+<span id="L779"><span class="lineNum">     779</span>              : </span>
+<span id="L780"><span class="lineNum">     780</span>              :     /**</span>
+<span id="L781"><span class="lineNum">     781</span>              :      * @notice Returns the amount of unfrozen CELO included in the reserve.</span>
+<span id="L782"><span class="lineNum">     782</span>              :      * @return The unfrozen CELO amount included in the reserve.</span>
+<span id="L783"><span class="lineNum">     783</span>              :      */</span>
+<span id="L784"><span class="lineNum">     784</span>              :     function getUnfrozenReserveGoldBalance() public view returns (uint256) {</span>
+<span id="L785"><span class="lineNum">     785</span> <span class="tlaUNC">           0 :         return getUnfrozenBalance().add(getOtherReserveAddressesGoldBalance());</span></span>
+<span id="L786"><span class="lineNum">     786</span>              :     }</span>
+<span id="L787"><span class="lineNum">     787</span>              : </span>
+<span id="L788"><span class="lineNum">     788</span>              :     /**</span>
+<span id="L789"><span class="lineNum">     789</span>              :      * @notice Returns the amount of particular collateral asset</span>
+<span id="L790"><span class="lineNum">     790</span>              :      * in reserve including other reserve addresses.</span>
+<span id="L791"><span class="lineNum">     791</span>              :      * @param collateralAsset the asset we're checking a balance of</span>
+<span id="L792"><span class="lineNum">     792</span>              :      * @return The balance of particular collateral asset.</span>
+<span id="L793"><span class="lineNum">     793</span>              :      */</span>
+<span id="L794"><span class="lineNum">     794</span>              :     function getReserveAddressesCollateralAssetBalance(</span>
+<span id="L795"><span class="lineNum">     795</span>              :         address collateralAsset</span>
+<span id="L796"><span class="lineNum">     796</span>              :     ) public view returns (uint256) {</span>
+<span id="L797"><span class="lineNum">     797</span> <span class="tlaGNC tlaBgGNC">           2 :         require(</span></span>
+<span id="L798"><span class="lineNum">     798</span>              :             checkIsCollateralAsset(collateralAsset),</span>
+<span id="L799"><span class="lineNum">     799</span>              :             &quot;specified address is not a collateral asset&quot;</span>
+<span id="L800"><span class="lineNum">     800</span>              :         );</span>
+<span id="L801"><span class="lineNum">     801</span> <span class="tlaGNC">           2 :         uint256 reserveCollateralAssetBalance = 0;</span></span>
+<span id="L802"><span class="lineNum">     802</span>              :         // slither-disable-next-line cache-array-length</span>
+<span id="L803"><span class="lineNum">     803</span> <span class="tlaGNC">           2 :         for (uint256 i = 0; i &lt; otherReserveAddresses.length; i++) {</span></span>
+<span id="L804"><span class="lineNum">     804</span>              :             // slither-disable-next-line calls-loop</span>
+<span id="L805"><span class="lineNum">     805</span> <span class="tlaUNC tlaBgUNC">           0 :             reserveCollateralAssetBalance = reserveCollateralAssetBalance.add(</span></span>
+<span id="L806"><span class="lineNum">     806</span>              :                 IERC20(collateralAsset).balanceOf(otherReserveAddresses[i])</span>
+<span id="L807"><span class="lineNum">     807</span>              :             );</span>
+<span id="L808"><span class="lineNum">     808</span>              :         }</span>
+<span id="L809"><span class="lineNum">     809</span> <span class="tlaGNC tlaBgGNC">           2 :         return</span></span>
+<span id="L810"><span class="lineNum">     810</span> <span class="tlaGNC">           2 :             reserveCollateralAssetBalance.add(</span></span>
+<span id="L811"><span class="lineNum">     811</span>              :                 IERC20(collateralAsset).balanceOf(address(this))</span>
+<span id="L812"><span class="lineNum">     812</span>              :             );</span>
+<span id="L813"><span class="lineNum">     813</span>              :     }</span>
+<span id="L814"><span class="lineNum">     814</span>              : </span>
+<span id="L815"><span class="lineNum">     815</span>              :     /**</span>
+<span id="L816"><span class="lineNum">     816</span>              :      * @notice Add a collateral asset in the reserve.</span>
+<span id="L817"><span class="lineNum">     817</span>              :      * @param collateralAsset The address of the token being added.</span>
+<span id="L818"><span class="lineNum">     818</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L819"><span class="lineNum">     819</span>              :      */</span>
+<span id="L820"><span class="lineNum">     820</span>              :     function addCollateralAsset(</span>
+<span id="L821"><span class="lineNum">     821</span>              :         address collateralAsset</span>
+<span id="L822"><span class="lineNum">     822</span>              :     ) public onlyOwner returns (bool) {</span>
+<span id="L823"><span class="lineNum">     823</span> <span class="tlaGNC">           6 :         require(</span></span>
+<span id="L824"><span class="lineNum">     824</span>              :             !checkIsCollateralAsset(collateralAsset),</span>
+<span id="L825"><span class="lineNum">     825</span>              :             &quot;specified address is already added as a collateral asset&quot;</span>
+<span id="L826"><span class="lineNum">     826</span>              :         );</span>
+<span id="L827"><span class="lineNum">     827</span> <span class="tlaGNC">           6 :         require(collateralAsset != address(0), &quot;can't be a zero address&quot;);</span></span>
+<span id="L828"><span class="lineNum">     828</span> <span class="tlaGNC">           6 :         isCollateralAsset[collateralAsset] = true;</span></span>
+<span id="L829"><span class="lineNum">     829</span> <span class="tlaGNC">           6 :         collateralAssets.push(collateralAsset);</span></span>
+<span id="L830"><span class="lineNum">     830</span> <span class="tlaGNC">           6 :         emit CollateralAssetAdded(collateralAsset);</span></span>
+<span id="L831"><span class="lineNum">     831</span> <span class="tlaGNC">           6 :         return true;</span></span>
+<span id="L832"><span class="lineNum">     832</span>              :     }</span>
+<span id="L833"><span class="lineNum">     833</span>              : </span>
+<span id="L834"><span class="lineNum">     834</span>              :     /**</span>
+<span id="L835"><span class="lineNum">     835</span>              :      * @notice Remove a collateral asset in the reserve.</span>
+<span id="L836"><span class="lineNum">     836</span>              :      * @param collateralAsset The address of the token being removed.</span>
+<span id="L837"><span class="lineNum">     837</span>              :      * @param index The index of the token being removed.</span>
+<span id="L838"><span class="lineNum">     838</span>              :      * @return Returns true if the transaction succeeds.</span>
+<span id="L839"><span class="lineNum">     839</span>              :      */</span>
+<span id="L840"><span class="lineNum">     840</span>              :     function removeCollateralAsset(</span>
+<span id="L841"><span class="lineNum">     841</span>              :         address collateralAsset,</span>
+<span id="L842"><span class="lineNum">     842</span>              :         uint256 index</span>
+<span id="L843"><span class="lineNum">     843</span>              :     ) external onlyOwner returns (bool) {</span>
+<span id="L844"><span class="lineNum">     844</span> <span class="tlaUNC tlaBgUNC">           0 :         require(</span></span>
+<span id="L845"><span class="lineNum">     845</span>              :             checkIsCollateralAsset(collateralAsset),</span>
+<span id="L846"><span class="lineNum">     846</span>              :             &quot;specified address is not a collateral asset&quot;</span>
+<span id="L847"><span class="lineNum">     847</span>              :         );</span>
+<span id="L848"><span class="lineNum">     848</span> <span class="tlaUNC">           0 :         require(</span></span>
+<span id="L849"><span class="lineNum">     849</span>              :             index &lt; collateralAssets.length &amp;&amp;</span>
+<span id="L850"><span class="lineNum">     850</span>              :                 collateralAssets[index] == collateralAsset,</span>
+<span id="L851"><span class="lineNum">     851</span>              :             &quot;index into collateralAssets list not mapped to token&quot;</span>
+<span id="L852"><span class="lineNum">     852</span>              :         );</span>
+<span id="L853"><span class="lineNum">     853</span> <span class="tlaUNC">           0 :         collateralAssets[index] = collateralAssets[</span></span>
+<span id="L854"><span class="lineNum">     854</span>              :             collateralAssets.length.sub(1)</span>
+<span id="L855"><span class="lineNum">     855</span>              :         ];</span>
+<span id="L856"><span class="lineNum">     856</span> <span class="tlaUNC">           0 :         collateralAssets.pop();</span></span>
+<span id="L857"><span class="lineNum">     857</span> <span class="tlaUNC">           0 :         delete isCollateralAsset[collateralAsset];</span></span>
+<span id="L858"><span class="lineNum">     858</span> <span class="tlaUNC">           0 :         emit CollateralAssetRemoved(collateralAsset);</span></span>
+<span id="L859"><span class="lineNum">     859</span> <span class="tlaUNC">           0 :         return true;</span></span>
+<span id="L860"><span class="lineNum">     860</span>              :     }</span>
+<span id="L861"><span class="lineNum">     861</span>              : </span>
+<span id="L862"><span class="lineNum">     862</span>              :     /**</span>
+<span id="L863"><span class="lineNum">     863</span>              :      * @notice Check if a collateral asset is added to the reserve.</span>
+<span id="L864"><span class="lineNum">     864</span>              :      * @param collateralAsset The address of the token being checked.</span>
+<span id="L865"><span class="lineNum">     865</span>              :      * @return Returns true if the token was added as a collateral asset.</span>
+<span id="L866"><span class="lineNum">     866</span>              :      */</span>
+<span id="L867"><span class="lineNum">     867</span>              :     function checkIsCollateralAsset(</span>
+<span id="L868"><span class="lineNum">     868</span>              :         address collateralAsset</span>
+<span id="L869"><span class="lineNum">     869</span>              :     ) public view returns (bool) {</span>
+<span id="L870"><span class="lineNum">     870</span> <span class="tlaGNC tlaBgGNC">          14 :         return isCollateralAsset[collateralAsset];</span></span>
+<span id="L871"><span class="lineNum">     871</span>              :     }</span>
+<span id="L872"><span class="lineNum">     872</span>              : </span>
+<span id="L873"><span class="lineNum">     873</span>              :     /**</span>
+<span id="L874"><span class="lineNum">     874</span>              :      * @notice Returns the amount of frozen CELO in the reserve.</span>
+<span id="L875"><span class="lineNum">     875</span>              :      * @return The total frozen CELO in the reserve.</span>
+<span id="L876"><span class="lineNum">     876</span>              :      */</span>
+<span id="L877"><span class="lineNum">     877</span>              :     function getFrozenReserveGoldBalance() public view returns (uint256) {</span>
+<span id="L878"><span class="lineNum">     878</span> <span class="tlaUNC tlaBgUNC">           0 :         uint256 currentDay = now / 1 days;</span></span>
+<span id="L879"><span class="lineNum">     879</span> <span class="tlaUNC">           0 :         uint256 frozenDays = currentDay.sub(frozenReserveGoldStartDay);</span></span>
+<span id="L880"><span class="lineNum">     880</span> <span class="tlaUNC">           0 :         if (frozenDays &gt;= frozenReserveGoldDays) return 0;</span></span>
+<span id="L881"><span class="lineNum">     881</span> <span class="tlaUNC">           0 :         return</span></span>
+<span id="L882"><span class="lineNum">     882</span> <span class="tlaUNC">           0 :             frozenReserveGoldStartBalance.sub(</span></span>
+<span id="L883"><span class="lineNum">     883</span>              :                 frozenReserveGoldStartBalance.mul(frozenDays).div(</span>
+<span id="L884"><span class="lineNum">     884</span>              :                     frozenReserveGoldDays</span>
+<span id="L885"><span class="lineNum">     885</span>              :                 )</span>
+<span id="L886"><span class="lineNum">     886</span>              :             );</span>
+<span id="L887"><span class="lineNum">     887</span>              :     }</span>
+<span id="L888"><span class="lineNum">     888</span>              : </span>
+<span id="L889"><span class="lineNum">     889</span>              :     /**</span>
+<span id="L890"><span class="lineNum">     890</span>              :      * @notice Computes the ratio of current reserve balance to total stable token valuation.</span>
+<span id="L891"><span class="lineNum">     891</span>              :      * @return Reserve ratio in a fixed point format.</span>
+<span id="L892"><span class="lineNum">     892</span>              :      */</span>
+<span id="L893"><span class="lineNum">     893</span>              :     function getReserveRatio() public view returns (uint256) {</span>
+<span id="L894"><span class="lineNum">     894</span> <span class="tlaUNC">           0 :         address sortedOraclesAddress = registry.getAddressForOrDie(</span></span>
+<span id="L895"><span class="lineNum">     895</span>              :             SORTED_ORACLES_REGISTRY_ID</span>
+<span id="L896"><span class="lineNum">     896</span>              :         );</span>
+<span id="L897"><span class="lineNum">     897</span> <span class="tlaUNC">           0 :         ISortedOracles sortedOracles = ISortedOracles(sortedOraclesAddress);</span></span>
+<span id="L898"><span class="lineNum">     898</span> <span class="tlaUNC">           0 :         uint256 reserveGoldBalance = getUnfrozenReserveGoldBalance();</span></span>
+<span id="L899"><span class="lineNum">     899</span> <span class="tlaUNC">           0 :         uint256 stableTokensValueInGold = 0;</span></span>
+<span id="L900"><span class="lineNum">     900</span> <span class="tlaUNC">           0 :         FixidityLib.Fraction memory cgldWeight = FixidityLib.wrap(</span></span>
+<span id="L901"><span class="lineNum">     901</span>              :             assetAllocationWeights[&quot;cGLD&quot;]</span>
+<span id="L902"><span class="lineNum">     902</span>              :         );</span>
+<span id="L903"><span class="lineNum">     903</span>              : </span>
+<span id="L904"><span class="lineNum">     904</span>              :         // slither-disable-next-line cache-array-length</span>
+<span id="L905"><span class="lineNum">     905</span> <span class="tlaUNC">           0 :         for (uint256 i = 0; i &lt; _tokens.length; i = i.add(1)) {</span></span>
+<span id="L906"><span class="lineNum">     906</span> <span class="tlaUNC">           0 :             uint256 stableAmount;</span></span>
+<span id="L907"><span class="lineNum">     907</span> <span class="tlaUNC">           0 :             uint256 goldAmount;</span></span>
+<span id="L908"><span class="lineNum">     908</span>              :             // slither-disable-next-line calls-loop</span>
+<span id="L909"><span class="lineNum">     909</span> <span class="tlaUNC">           0 :             (stableAmount, goldAmount) = sortedOracles.medianRate(_tokens[i]);</span></span>
+<span id="L910"><span class="lineNum">     910</span>              : </span>
+<span id="L911"><span class="lineNum">     911</span> <span class="tlaUNC">           0 :             if (goldAmount != 0) {</span></span>
+<span id="L912"><span class="lineNum">     912</span>              :                 // tokens with no oracle reports don't count towards collateralization ratio</span>
+<span id="L913"><span class="lineNum">     913</span>              :                 // slither-disable-next-line calls-loop</span>
+<span id="L914"><span class="lineNum">     914</span> <span class="tlaUNC">           0 :                 uint256 stableTokenSupply = IERC20(_tokens[i]).totalSupply();</span></span>
+<span id="L915"><span class="lineNum">     915</span> <span class="tlaUNC">           0 :                 uint256 aStableTokenValueInGold = stableTokenSupply</span></span>
+<span id="L916"><span class="lineNum">     916</span>              :                     .mul(goldAmount)</span>
+<span id="L917"><span class="lineNum">     917</span>              :                     .div(stableAmount);</span>
+<span id="L918"><span class="lineNum">     918</span> <span class="tlaUNC">           0 :                 stableTokensValueInGold = stableTokensValueInGold.add(</span></span>
+<span id="L919"><span class="lineNum">     919</span>              :                     aStableTokenValueInGold</span>
+<span id="L920"><span class="lineNum">     920</span>              :                 );</span>
+<span id="L921"><span class="lineNum">     921</span>              :             }</span>
+<span id="L922"><span class="lineNum">     922</span>              :         }</span>
+<span id="L923"><span class="lineNum">     923</span> <span class="tlaUNC">           0 :         return</span></span>
+<span id="L924"><span class="lineNum">     924</span> <span class="tlaUNC">           0 :             FixidityLib</span></span>
+<span id="L925"><span class="lineNum">     925</span>              :                 .newFixed(reserveGoldBalance)</span>
+<span id="L926"><span class="lineNum">     926</span>              :                 .divide(cgldWeight)</span>
+<span id="L927"><span class="lineNum">     927</span>              :                 .divide(FixidityLib.newFixed(stableTokensValueInGold))</span>
+<span id="L928"><span class="lineNum">     928</span>              :                 .unwrap();</span>
+<span id="L929"><span class="lineNum">     929</span>              :     }</span>
+<span id="L930"><span class="lineNum">     930</span>              : </span>
+<span id="L931"><span class="lineNum">     931</span>              :     /*</span>
+<span id="L932"><span class="lineNum">     932</span>              :      * Internal functions</span>
+<span id="L933"><span class="lineNum">     933</span>              :      */</span>
+<span id="L934"><span class="lineNum">     934</span>              : </span>
+<span id="L935"><span class="lineNum">     935</span>              :     /**</span>
+<span id="L936"><span class="lineNum">     936</span>              :      * @notice Computes a tobin tax based on the reserve ratio.</span>
+<span id="L937"><span class="lineNum">     937</span>              :      * @return The tobin tax expresesed as a fixidity fraction.</span>
+<span id="L938"><span class="lineNum">     938</span>              :      */</span>
+<span id="L939"><span class="lineNum">     939</span>              :     function computeTobinTax()</span>
+<span id="L940"><span class="lineNum">     940</span>              :         private</span>
+<span id="L941"><span class="lineNum">     941</span>              :         view</span>
+<span id="L942"><span class="lineNum">     942</span>              :         returns (FixidityLib.Fraction memory)</span>
+<span id="L943"><span class="lineNum">     943</span>              :     {</span>
+<span id="L944"><span class="lineNum">     944</span> <span class="tlaUNC">           0 :         FixidityLib.Fraction memory ratio = FixidityLib.wrap(getReserveRatio());</span></span>
+<span id="L945"><span class="lineNum">     945</span> <span class="tlaUNC">           0 :         if (ratio.gte(FixidityLib.wrap(tobinTaxReserveRatio))) {</span></span>
+<span id="L946"><span class="lineNum">     946</span> <span class="tlaUNC">           0 :             return FixidityLib.wrap(0);</span></span>
+<span id="L947"><span class="lineNum">     947</span>              :         } else {</span>
+<span id="L948"><span class="lineNum">     948</span> <span class="tlaUNC">           0 :             return FixidityLib.wrap(tobinTax);</span></span>
+<span id="L949"><span class="lineNum">     949</span>              :         }</span>
+<span id="L950"><span class="lineNum">     950</span>              :     }</span>
+<span id="L951"><span class="lineNum">     951</span>              : </span>
+<span id="L952"><span class="lineNum">     952</span>              :     function isStableAsset(address token) external view returns (bool) {</span>
+<span id="L953"><span class="lineNum">     953</span> <span class="tlaGNC tlaBgGNC">          20 :         return isToken[token];</span></span>
+<span id="L954"><span class="lineNum">     954</span>              :     }</span>
+<span id="L955"><span class="lineNum">     955</span>              : }</span>
+        </pre>
+              </td>
+            </tr>
+          </table>
+          <br>
+
+          <table width="100%" border=0 cellspacing=0 cellpadding=0>
+            <tr><td class="ruler"><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
+            <tr><td class="versionInfo">Generated by: <a href="https://github.com//linux-test-project/lcov" target="_parent">LCOV version 2.1-1</a></td></tr>
+          </table>
+          <br>
+
+</body>
+</html>
diff --git a/coverage_report/contracts/swap/index-sort-f.html b/coverage_report/contracts/swap/index-sort-f.html
index c10e27a..d58ef98 100644
--- a/coverage_report/contracts/swap/index-sort-f.html
+++ b/coverage_report/contracts/swap/index-sort-f.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.4&nbsp;%</td>
-            <td class="headerCovTableEntry">77</td>
-            <td class="headerCovTableEntry">75</td>
+            <td class="headerCovTableEntryLo">54.9&nbsp;%</td>
+            <td class="headerCovTableEntry">275</td>
+            <td class="headerCovTableEntry">151</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntryLo">37.1&nbsp;%</td>
+            <td class="headerCovTableEntry">62</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
                   <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
@@ -79,6 +79,18 @@
                     <td class="tableHead"> Total</td>
                     <td class="tableHead"> Hit</td>
             </tr>
+            <tr>
+              <td class="coverFile"><a href="Reserve.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/swap/Reserve.sol">Reserve.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=38 height=10 alt="38.4%"><img src="../../snow.png" width=62 height=10 alt="38.4%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">38.4&nbsp;%</td>
+              <td class="coverNumDflt">198</td>
+              <td class="coverNumDflt">76</td>
+              <td class="coverPerLo">15.2&nbsp;%</td>
+              <td class="coverNumDflt">46</td>
+              <td class="coverNumDflt">7</td>
+            </tr>
             <tr>
               <td class="coverFile"><a href="Broker.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/swap/Broker.sol">Broker.sol</a></td>
               <td class="coverBar" align="center">
diff --git a/coverage_report/contracts/swap/index-sort-l.html b/coverage_report/contracts/swap/index-sort-l.html
index 829cf58..201d686 100644
--- a/coverage_report/contracts/swap/index-sort-l.html
+++ b/coverage_report/contracts/swap/index-sort-l.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.4&nbsp;%</td>
-            <td class="headerCovTableEntry">77</td>
-            <td class="headerCovTableEntry">75</td>
+            <td class="headerCovTableEntryLo">54.9&nbsp;%</td>
+            <td class="headerCovTableEntry">275</td>
+            <td class="headerCovTableEntry">151</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntryLo">37.1&nbsp;%</td>
+            <td class="headerCovTableEntry">62</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
                   <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
@@ -79,6 +79,18 @@
                     <td class="tableHead"> Total</td>
                     <td class="tableHead"> Hit</td>
             </tr>
+            <tr>
+              <td class="coverFile"><a href="Reserve.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/swap/Reserve.sol">Reserve.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=38 height=10 alt="38.4%"><img src="../../snow.png" width=62 height=10 alt="38.4%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">38.4&nbsp;%</td>
+              <td class="coverNumDflt">198</td>
+              <td class="coverNumDflt">76</td>
+              <td class="coverPerLo">15.2&nbsp;%</td>
+              <td class="coverNumDflt">46</td>
+              <td class="coverNumDflt">7</td>
+            </tr>
             <tr>
               <td class="coverFile"><a href="Broker.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/swap/Broker.sol">Broker.sol</a></td>
               <td class="coverBar" align="center">
diff --git a/coverage_report/contracts/swap/index.html b/coverage_report/contracts/swap/index.html
index 558c6a6..f215052 100644
--- a/coverage_report/contracts/swap/index.html
+++ b/coverage_report/contracts/swap/index.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryHi">97.4&nbsp;%</td>
-            <td class="headerCovTableEntry">77</td>
-            <td class="headerCovTableEntry">75</td>
+            <td class="headerCovTableEntryLo">54.9&nbsp;%</td>
+            <td class="headerCovTableEntry">275</td>
+            <td class="headerCovTableEntry">151</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
-            <td class="headerCovTableEntry">16</td>
-            <td class="headerCovTableEntry">16</td>
+            <td class="headerCovTableEntryLo">37.1&nbsp;%</td>
+            <td class="headerCovTableEntry">62</td>
+            <td class="headerCovTableEntry">23</td>
           </tr>
                   <tr><td><img src="../../glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
@@ -91,6 +91,18 @@
               <td class="coverNumDflt">16</td>
               <td class="coverNumDflt">16</td>
             </tr>
+            <tr>
+              <td class="coverFile"><a href="Reserve.sol.gcov.html" title="Click to go to file /Users/chapati/projects/mento/gooddollar/contracts/swap/Reserve.sol">Reserve.sol</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../ruby.png" width=38 height=10 alt="38.4%"><img src="../../snow.png" width=62 height=10 alt="38.4%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">38.4&nbsp;%</td>
+              <td class="coverNumDflt">198</td>
+              <td class="coverNumDflt">76</td>
+              <td class="coverPerLo">15.2&nbsp;%</td>
+              <td class="coverNumDflt">46</td>
+              <td class="coverNumDflt">7</td>
+            </tr>
           </table>
           </center>
           <br>
diff --git a/coverage_report/index-sort-f.html b/coverage_report/index-sort-f.html
index 8b92d32..a95e10b 100644
--- a/coverage_report/index-sort-f.html
+++ b/coverage_report/index-sort-f.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">81.3&nbsp;%</td>
-            <td class="headerCovTableEntry">857</td>
-            <td class="headerCovTableEntry">697</td>
+            <td class="headerCovTableEntryLo">73.0&nbsp;%</td>
+            <td class="headerCovTableEntry">1070</td>
+            <td class="headerCovTableEntry">781</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">83.6&nbsp;%</td>
-            <td class="headerCovTableEntry">146</td>
-            <td class="headerCovTableEntry">122</td>
+            <td class="headerCovTableEntryLo">65.0&nbsp;%</td>
+            <td class="headerCovTableEntry">203</td>
+            <td class="headerCovTableEntry">132</td>
           </tr>
                   <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
@@ -79,6 +79,42 @@
                     <td class="tableHead"> Total</td>
                     <td class="tableHead"> Hit</td>
             </tr>
+            <tr>
+              <td class="coverDirectory"><a href="contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/common">contracts/common/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=53 height=10 alt="52.9%"><img src="snow.png" width=47 height=10 alt="52.9%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">52.9&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverPerLo">30.8&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">4</td>
+            </tr>
+            <tr>
+              <td class="coverDirectory"><a href="contracts/swap/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/swap">contracts/swap/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=55 height=10 alt="54.9%"><img src="snow.png" width=45 height=10 alt="54.9%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">54.9&nbsp;%</td>
+              <td class="coverNumDflt">275</td>
+              <td class="coverNumDflt">151</td>
+              <td class="coverPerLo">37.1&nbsp;%</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">23</td>
+            </tr>
+            <tr>
+              <td class="coverDirectory"><a href="node_modules/@celo/contracts/common/libraries/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/node_modules/@celo/contracts/common/libraries">node_modules/@celo/contracts/common/libraries/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=25 height=10 alt="25.0%"><img src="snow.png" width=75 height=10 alt="25.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">25.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
+            </tr>
             <tr>
               <td class="coverDirectory"><a href="test/utils/mocks/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/test/utils/mocks">test/utils/mocks/</a></td>
               <td class="coverBar" align="center">
@@ -94,23 +130,23 @@
             <tr>
               <td class="coverDirectory"><a href="node_modules/@celo/contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/node_modules/@celo/contracts/common">node_modules/@celo/contracts/common/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=80 height=10 alt="80.0%"><img src="snow.png" width=20 height=10 alt="80.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
               <td class="coverNumDflt">60</td>
-              <td class="coverNumDflt">48</td>
-              <td class="coverPerLo">62.5&nbsp;%</td>
+              <td class="coverNumDflt">50</td>
+              <td class="coverPerLo">70.8&nbsp;%</td>
               <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">17</td>
             </tr>
             <tr>
               <td class="coverDirectory"><a href="contracts/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts">contracts/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=77 height=10 alt="77.4%"><img src="snow.png" width=23 height=10 alt="77.4%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=78 height=10 alt="77.8%"><img src="snow.png" width=22 height=10 alt="77.8%"></td></tr></table>
               </td>
-              <td class="coverPerMed">77.4&nbsp;%</td>
+              <td class="coverPerMed">77.8&nbsp;%</td>
               <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">446</td>
+              <td class="coverNumDflt">448</td>
               <td class="coverPerHi">91.8&nbsp;%</td>
               <td class="coverNumDflt">61</td>
               <td class="coverNumDflt">56</td>
@@ -127,18 +163,6 @@
               <td class="coverNumDflt">1</td>
               <td class="coverNumDflt">1</td>
             </tr>
-            <tr>
-              <td class="coverDirectory"><a href="contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/common">contracts/common/</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
-            </tr>
             <tr>
               <td class="coverDirectory"><a href="test/utils/harnesses/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/test/utils/harnesses">test/utils/harnesses/</a></td>
               <td class="coverBar" align="center">
@@ -175,18 +199,6 @@
               <td class="coverNumDflt">6</td>
               <td class="coverNumDflt">6</td>
             </tr>
-            <tr>
-              <td class="coverDirectory"><a href="contracts/swap/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/swap">contracts/swap/</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=97 height=10 alt="97.4%"><img src="snow.png" width=3 height=10 alt="97.4%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">97.4&nbsp;%</td>
-              <td class="coverNumDflt">77</td>
-              <td class="coverNumDflt">75</td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
-            </tr>
           </table>
           </center>
           <br>
diff --git a/coverage_report/index-sort-l.html b/coverage_report/index-sort-l.html
index e9a1d90..530599e 100644
--- a/coverage_report/index-sort-l.html
+++ b/coverage_report/index-sort-l.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">81.3&nbsp;%</td>
-            <td class="headerCovTableEntry">857</td>
-            <td class="headerCovTableEntry">697</td>
+            <td class="headerCovTableEntryLo">73.0&nbsp;%</td>
+            <td class="headerCovTableEntry">1070</td>
+            <td class="headerCovTableEntry">781</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">83.6&nbsp;%</td>
-            <td class="headerCovTableEntry">146</td>
-            <td class="headerCovTableEntry">122</td>
+            <td class="headerCovTableEntryLo">65.0&nbsp;%</td>
+            <td class="headerCovTableEntry">203</td>
+            <td class="headerCovTableEntry">132</td>
           </tr>
                   <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
@@ -79,6 +79,42 @@
                     <td class="tableHead"> Total</td>
                     <td class="tableHead"> Hit</td>
             </tr>
+            <tr>
+              <td class="coverDirectory"><a href="node_modules/@celo/contracts/common/libraries/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/node_modules/@celo/contracts/common/libraries">node_modules/@celo/contracts/common/libraries/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=25 height=10 alt="25.0%"><img src="snow.png" width=75 height=10 alt="25.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">25.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
+            </tr>
+            <tr>
+              <td class="coverDirectory"><a href="contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/common">contracts/common/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=53 height=10 alt="52.9%"><img src="snow.png" width=47 height=10 alt="52.9%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">52.9&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverPerLo">30.8&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
+              <td class="coverNumDflt">4</td>
+            </tr>
+            <tr>
+              <td class="coverDirectory"><a href="contracts/swap/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/swap">contracts/swap/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=55 height=10 alt="54.9%"><img src="snow.png" width=45 height=10 alt="54.9%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">54.9&nbsp;%</td>
+              <td class="coverNumDflt">275</td>
+              <td class="coverNumDflt">151</td>
+              <td class="coverPerLo">37.1&nbsp;%</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">23</td>
+            </tr>
             <tr>
               <td class="coverDirectory"><a href="test/utils/mocks/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/test/utils/mocks">test/utils/mocks/</a></td>
               <td class="coverBar" align="center">
@@ -94,11 +130,11 @@
             <tr>
               <td class="coverDirectory"><a href="contracts/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts">contracts/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=77 height=10 alt="77.4%"><img src="snow.png" width=23 height=10 alt="77.4%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=78 height=10 alt="77.8%"><img src="snow.png" width=22 height=10 alt="77.8%"></td></tr></table>
               </td>
-              <td class="coverPerMed">77.4&nbsp;%</td>
+              <td class="coverPerMed">77.8&nbsp;%</td>
               <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">446</td>
+              <td class="coverNumDflt">448</td>
               <td class="coverPerHi">91.8&nbsp;%</td>
               <td class="coverNumDflt">61</td>
               <td class="coverNumDflt">56</td>
@@ -106,14 +142,14 @@
             <tr>
               <td class="coverDirectory"><a href="node_modules/@celo/contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/node_modules/@celo/contracts/common">node_modules/@celo/contracts/common/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=80 height=10 alt="80.0%"><img src="snow.png" width=20 height=10 alt="80.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
               <td class="coverNumDflt">60</td>
-              <td class="coverNumDflt">48</td>
-              <td class="coverPerLo">62.5&nbsp;%</td>
+              <td class="coverNumDflt">50</td>
+              <td class="coverPerLo">70.8&nbsp;%</td>
               <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">17</td>
             </tr>
             <tr>
               <td class="coverDirectory"><a href="contracts/libraries/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/libraries">contracts/libraries/</a></td>
@@ -127,18 +163,6 @@
               <td class="coverNumDflt">5</td>
               <td class="coverNumDflt">5</td>
             </tr>
-            <tr>
-              <td class="coverDirectory"><a href="contracts/swap/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/swap">contracts/swap/</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=97 height=10 alt="97.4%"><img src="snow.png" width=3 height=10 alt="97.4%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">97.4&nbsp;%</td>
-              <td class="coverNumDflt">77</td>
-              <td class="coverNumDflt">75</td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
-            </tr>
             <tr>
               <td class="coverDirectory"><a href="test/utils/harnesses/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/test/utils/harnesses">test/utils/harnesses/</a></td>
               <td class="coverBar" align="center">
@@ -151,18 +175,6 @@
               <td class="coverNumDflt">4</td>
               <td class="coverNumDflt">4</td>
             </tr>
-            <tr>
-              <td class="coverDirectory"><a href="contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/common">contracts/common/</a></td>
-              <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-              </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
-              <td class="coverNumDflt">4</td>
-            </tr>
             <tr>
               <td class="coverDirectory"><a href="test/unit/swap/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/test/unit/swap">test/unit/swap/</a></td>
               <td class="coverBar" align="center">
diff --git a/coverage_report/index.html b/coverage_report/index.html
index c90260f..5a10654 100644
--- a/coverage_report/index.html
+++ b/coverage_report/index.html
@@ -31,18 +31,18 @@
             <td class="headerValue">lcov.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntryMed">81.3&nbsp;%</td>
-            <td class="headerCovTableEntry">857</td>
-            <td class="headerCovTableEntry">697</td>
+            <td class="headerCovTableEntryLo">73.0&nbsp;%</td>
+            <td class="headerCovTableEntry">1070</td>
+            <td class="headerCovTableEntry">781</td>
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
-            <td class="headerCovTableEntryMed">83.6&nbsp;%</td>
-            <td class="headerCovTableEntry">146</td>
-            <td class="headerCovTableEntry">122</td>
+            <td class="headerCovTableEntryLo">65.0&nbsp;%</td>
+            <td class="headerCovTableEntry">203</td>
+            <td class="headerCovTableEntry">132</td>
           </tr>
                   <tr><td><img src="glass.png" width=3 height=3 alt=""></td></tr>
                 </table>
@@ -82,11 +82,11 @@
             <tr>
               <td class="coverDirectory"><a href="contracts/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts">contracts/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=77 height=10 alt="77.4%"><img src="snow.png" width=23 height=10 alt="77.4%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=78 height=10 alt="77.8%"><img src="snow.png" width=22 height=10 alt="77.8%"></td></tr></table>
               </td>
-              <td class="coverPerMed">77.4&nbsp;%</td>
+              <td class="coverPerMed">77.8&nbsp;%</td>
               <td class="coverNumDflt">576</td>
-              <td class="coverNumDflt">446</td>
+              <td class="coverNumDflt">448</td>
               <td class="coverPerHi">91.8&nbsp;%</td>
               <td class="coverNumDflt">61</td>
               <td class="coverNumDflt">56</td>
@@ -94,13 +94,13 @@
             <tr>
               <td class="coverDirectory"><a href="contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/common">contracts/common/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=53 height=10 alt="52.9%"><img src="snow.png" width=47 height=10 alt="52.9%"></td></tr></table>
               </td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverNumDflt">6</td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">4</td>
+              <td class="coverPerLo">52.9&nbsp;%</td>
+              <td class="coverNumDflt">17</td>
+              <td class="coverNumDflt">9</td>
+              <td class="coverPerLo">30.8&nbsp;%</td>
+              <td class="coverNumDflt">13</td>
               <td class="coverNumDflt">4</td>
             </tr>
             <tr>
@@ -118,26 +118,38 @@
             <tr>
               <td class="coverDirectory"><a href="contracts/swap/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/contracts/swap">contracts/swap/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=97 height=10 alt="97.4%"><img src="snow.png" width=3 height=10 alt="97.4%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=55 height=10 alt="54.9%"><img src="snow.png" width=45 height=10 alt="54.9%"></td></tr></table>
               </td>
-              <td class="coverPerHi">97.4&nbsp;%</td>
-              <td class="coverNumDflt">77</td>
-              <td class="coverNumDflt">75</td>
-              <td class="coverPerHi">100.0&nbsp;%</td>
-              <td class="coverNumDflt">16</td>
-              <td class="coverNumDflt">16</td>
+              <td class="coverPerLo">54.9&nbsp;%</td>
+              <td class="coverNumDflt">275</td>
+              <td class="coverNumDflt">151</td>
+              <td class="coverPerLo">37.1&nbsp;%</td>
+              <td class="coverNumDflt">62</td>
+              <td class="coverNumDflt">23</td>
             </tr>
             <tr>
               <td class="coverDirectory"><a href="node_modules/@celo/contracts/common/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/node_modules/@celo/contracts/common">node_modules/@celo/contracts/common/</a></td>
               <td class="coverBar" align="center">
-                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=80 height=10 alt="80.0%"><img src="snow.png" width=20 height=10 alt="80.0%"></td></tr></table>
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="amber.png" width=83 height=10 alt="83.3%"><img src="snow.png" width=17 height=10 alt="83.3%"></td></tr></table>
               </td>
-              <td class="coverPerMed">80.0&nbsp;%</td>
+              <td class="coverPerMed">83.3&nbsp;%</td>
               <td class="coverNumDflt">60</td>
-              <td class="coverNumDflt">48</td>
-              <td class="coverPerLo">62.5&nbsp;%</td>
+              <td class="coverNumDflt">50</td>
+              <td class="coverPerLo">70.8&nbsp;%</td>
               <td class="coverNumDflt">24</td>
-              <td class="coverNumDflt">15</td>
+              <td class="coverNumDflt">17</td>
+            </tr>
+            <tr>
+              <td class="coverDirectory"><a href="node_modules/@celo/contracts/common/libraries/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/node_modules/@celo/contracts/common/libraries">node_modules/@celo/contracts/common/libraries/</a></td>
+              <td class="coverBar" align="center">
+                                <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="ruby.png" width=25 height=10 alt="25.0%"><img src="snow.png" width=75 height=10 alt="25.0%"></td></tr></table>
+              </td>
+              <td class="coverPerLo">25.0&nbsp;%</td>
+              <td class="coverNumDflt">4</td>
+              <td class="coverNumDflt">1</td>
+              <td class="coverPerLo">50.0&nbsp;%</td>
+              <td class="coverNumDflt">2</td>
+              <td class="coverNumDflt">1</td>
             </tr>
             <tr>
               <td class="coverDirectory"><a href="test/unit/goodDollar/index.html" title="Click to go to directory /Users/chapati/projects/mento/gooddollar/test/unit/goodDollar">test/unit/goodDollar/</a></td>
diff --git a/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func-c.html b/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func-c.html
index 66d94c1..d835caf 100644
--- a/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func-c.html
+++ b/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func.html b/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func.html
index fcbdd9b..c993807 100644
--- a/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func.html
+++ b/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.gcov.html b/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.gcov.html
index 6d299b6..b7d93f2 100644
--- a/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.gcov.html
+++ b/coverage_report/test/unit/goodDollar/BancorExchangeProvider.t.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func-c.html b/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func-c.html
index 2ac1d3b..db4eaf8 100644
--- a/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func-c.html
+++ b/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func.html b/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func.html
index ad2d950..6bd05bc 100644
--- a/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func.html
+++ b/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.gcov.html b/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.gcov.html
index 5a2f9d7..97042da 100644
--- a/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.gcov.html
+++ b/coverage_report/test/unit/goodDollar/GoodDollarExchangeProvider.t.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func-c.html b/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func-c.html
index 7bdd528..b4c2e4d 100644
--- a/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func-c.html
+++ b/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func.html b/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func.html
index e0156ba..792ba08 100644
--- a/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func.html
+++ b/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.gcov.html b/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.gcov.html
index bdc607b..be986de 100644
--- a/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.gcov.html
+++ b/coverage_report/test/unit/goodDollar/GoodDollarExpansionController.t.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/index-sort-f.html b/coverage_report/test/unit/goodDollar/index-sort-f.html
index 8f2068c..5be8673 100644
--- a/coverage_report/test/unit/goodDollar/index-sort-f.html
+++ b/coverage_report/test/unit/goodDollar/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/index-sort-l.html b/coverage_report/test/unit/goodDollar/index-sort-l.html
index e7627f2..d2250bb 100644
--- a/coverage_report/test/unit/goodDollar/index-sort-l.html
+++ b/coverage_report/test/unit/goodDollar/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/goodDollar/index.html b/coverage_report/test/unit/goodDollar/index.html
index 03359d9..e76e0a6 100644
--- a/coverage_report/test/unit/goodDollar/index.html
+++ b/coverage_report/test/unit/goodDollar/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/swap/Broker.t.sol.func-c.html b/coverage_report/test/unit/swap/Broker.t.sol.func-c.html
index b954369..5d934d7 100644
--- a/coverage_report/test/unit/swap/Broker.t.sol.func-c.html
+++ b/coverage_report/test/unit/swap/Broker.t.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/swap/Broker.t.sol.func.html b/coverage_report/test/unit/swap/Broker.t.sol.func.html
index a89eb83..2bed53c 100644
--- a/coverage_report/test/unit/swap/Broker.t.sol.func.html
+++ b/coverage_report/test/unit/swap/Broker.t.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/swap/Broker.t.sol.gcov.html b/coverage_report/test/unit/swap/Broker.t.sol.gcov.html
index 72cffa3..89d20c2 100644
--- a/coverage_report/test/unit/swap/Broker.t.sol.gcov.html
+++ b/coverage_report/test/unit/swap/Broker.t.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/swap/index-sort-f.html b/coverage_report/test/unit/swap/index-sort-f.html
index d06398e..9c55883 100644
--- a/coverage_report/test/unit/swap/index-sort-f.html
+++ b/coverage_report/test/unit/swap/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/swap/index-sort-l.html b/coverage_report/test/unit/swap/index-sort-l.html
index 8603b09..945b8f8 100644
--- a/coverage_report/test/unit/swap/index-sort-l.html
+++ b/coverage_report/test/unit/swap/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/unit/swap/index.html b/coverage_report/test/unit/swap/index.html
index 1f451f3..88b9f44 100644
--- a/coverage_report/test/unit/swap/index.html
+++ b/coverage_report/test/unit/swap/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func-c.html b/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func-c.html
index b182f24..2cd45e0 100644
--- a/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func-c.html
+++ b/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func.html b/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func.html
index 365bc59..33de900 100644
--- a/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func.html
+++ b/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.gcov.html b/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.gcov.html
index f3d22eb..1fb91e2 100644
--- a/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.gcov.html
+++ b/coverage_report/test/utils/harnesses/TradingLimitsHarness.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/harnesses/index-sort-f.html b/coverage_report/test/utils/harnesses/index-sort-f.html
index 33ba6bd..da6b088 100644
--- a/coverage_report/test/utils/harnesses/index-sort-f.html
+++ b/coverage_report/test/utils/harnesses/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/harnesses/index-sort-l.html b/coverage_report/test/utils/harnesses/index-sort-l.html
index 5f582b5..7e6e727 100644
--- a/coverage_report/test/utils/harnesses/index-sort-l.html
+++ b/coverage_report/test/utils/harnesses/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/harnesses/index.html b/coverage_report/test/utils/harnesses/index.html
index ed5654b..158ba17 100644
--- a/coverage_report/test/utils/harnesses/index.html
+++ b/coverage_report/test/utils/harnesses/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func-c.html b/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func-c.html
index d43d346..d5f557e 100644
--- a/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func-c.html
+++ b/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryMed">87.5&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func.html b/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func.html
index 9f36ce6..05aca9d 100644
--- a/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func.html
+++ b/coverage_report/test/utils/mocks/MockExchangeProvider.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryMed">87.5&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/MockExchangeProvider.sol.gcov.html b/coverage_report/test/utils/mocks/MockExchangeProvider.sol.gcov.html
index dbf2cf9..765f5fc 100644
--- a/coverage_report/test/utils/mocks/MockExchangeProvider.sol.gcov.html
+++ b/coverage_report/test/utils/mocks/MockExchangeProvider.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryMed">87.5&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/MockReserve.sol.func-c.html b/coverage_report/test/utils/mocks/MockReserve.sol.func-c.html
index 55ef5c5..cfbd34c 100644
--- a/coverage_report/test/utils/mocks/MockReserve.sol.func-c.html
+++ b/coverage_report/test/utils/mocks/MockReserve.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">35.7&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/MockReserve.sol.func.html b/coverage_report/test/utils/mocks/MockReserve.sol.func.html
index f2ae805..21a7991 100644
--- a/coverage_report/test/utils/mocks/MockReserve.sol.func.html
+++ b/coverage_report/test/utils/mocks/MockReserve.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">35.7&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/MockReserve.sol.gcov.html b/coverage_report/test/utils/mocks/MockReserve.sol.gcov.html
index 5b8eaca..02af702 100644
--- a/coverage_report/test/utils/mocks/MockReserve.sol.gcov.html
+++ b/coverage_report/test/utils/mocks/MockReserve.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">35.7&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/TestERC20.sol.func-c.html b/coverage_report/test/utils/mocks/TestERC20.sol.func-c.html
index 87d2e0b..075b5aa 100644
--- a/coverage_report/test/utils/mocks/TestERC20.sol.func-c.html
+++ b/coverage_report/test/utils/mocks/TestERC20.sol.func-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/TestERC20.sol.func.html b/coverage_report/test/utils/mocks/TestERC20.sol.func.html
index 80ca99e..12798c3 100644
--- a/coverage_report/test/utils/mocks/TestERC20.sol.func.html
+++ b/coverage_report/test/utils/mocks/TestERC20.sol.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/TestERC20.sol.gcov.html b/coverage_report/test/utils/mocks/TestERC20.sol.gcov.html
index 31ae66c..8dfd788 100644
--- a/coverage_report/test/utils/mocks/TestERC20.sol.gcov.html
+++ b/coverage_report/test/utils/mocks/TestERC20.sol.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryHi">100.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/index-sort-f.html b/coverage_report/test/utils/mocks/index-sort-f.html
index 4c650cd..780cd33 100644
--- a/coverage_report/test/utils/mocks/index-sort-f.html
+++ b/coverage_report/test/utils/mocks/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">60.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/index-sort-l.html b/coverage_report/test/utils/mocks/index-sort-l.html
index 37b4c12..e558b14 100644
--- a/coverage_report/test/utils/mocks/index-sort-l.html
+++ b/coverage_report/test/utils/mocks/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">60.0&nbsp;%</td>
diff --git a/coverage_report/test/utils/mocks/index.html b/coverage_report/test/utils/mocks/index.html
index 78a69a1..7b1bf24 100644
--- a/coverage_report/test/utils/mocks/index.html
+++ b/coverage_report/test/utils/mocks/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Test Date:</td>
-            <td class="headerValue">2024-10-08 14:43:01</td>
+            <td class="headerValue">2024-10-08 18:32:54</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntryLo">60.0&nbsp;%</td>
diff --git a/lcov.info b/lcov.info
index 573661a..e252c7a 100644
--- a/lcov.info
+++ b/lcov.info
@@ -1,7 +1,7 @@
 TN:
 SF:contracts/BancorExchangeProvider.sol
 FN:51,BancorExchangeProvider.
-FNDA:88,BancorExchangeProvider.
+FNDA:94,BancorExchangeProvider.
 DA:52,0
 BRDA:52,0,0,-
 DA:53,0
@@ -9,27 +9,27 @@ FN:62,BancorExchangeProvider.initialize
 FNDA:63,BancorExchangeProvider.initialize
 DA:63,63
 FN:66,BancorExchangeProvider._initialize
-FNDA:88,BancorExchangeProvider._initialize
-DA:70,88
-DA:72,88
-DA:73,88
-DA:74,88
+FNDA:94,BancorExchangeProvider._initialize
+DA:70,94
+DA:72,94
+DA:73,94
+DA:74,94
 FN:79,BancorExchangeProvider.onlyBroker
-FNDA:9,BancorExchangeProvider.onlyBroker
-DA:80,9
+FNDA:11,BancorExchangeProvider.onlyBroker
+DA:80,11
 BRDA:80,1,0,1
-BRDA:80,1,1,7
+BRDA:80,1,1,9
 FN:84,BancorExchangeProvider.verifyExchangeTokens
-FNDA:16,BancorExchangeProvider.verifyExchangeTokens
-DA:89,16
+FNDA:20,BancorExchangeProvider.verifyExchangeTokens
+DA:89,20
 BRDA:89,2,0,3
-BRDA:89,2,1,7
+BRDA:89,2,1,11
 FN:105,BancorExchangeProvider.getPoolExchange
-FNDA:7,BancorExchangeProvider.getPoolExchange
-DA:108,63
-DA:109,63
+FNDA:9,BancorExchangeProvider.getPoolExchange
+DA:108,91
+DA:109,91
 BRDA:109,3,0,8
-BRDA:109,3,1,55
+BRDA:109,3,1,83
 DA:113,0
 FN:120,BancorExchangeProvider.getExchangeIds
 FNDA:3,BancorExchangeProvider.getExchangeIds
@@ -44,43 +44,43 @@ DA:134,3
 DA:135,3
 DA:136,3
 FN:148,BancorExchangeProvider.getAmountOut
-FNDA:11,BancorExchangeProvider.getAmountOut
-DA:154,11
-DA:155,10
-DA:156,10
-DA:162,4
-DA:163,4
+FNDA:13,BancorExchangeProvider.getAmountOut
+DA:154,13
+DA:155,12
+DA:156,12
+DA:162,6
+DA:163,6
 FN:174,BancorExchangeProvider.getAmountIn
-FNDA:5,BancorExchangeProvider.getAmountIn
-DA:180,5
-DA:181,4
-DA:183,4
-DA:189,4
-DA:190,4
+FNDA:7,BancorExchangeProvider.getAmountIn
+DA:180,7
+DA:181,6
+DA:183,6
+DA:189,6
+DA:190,6
 FN:198,BancorExchangeProvider.currentPrice
-FNDA:6,BancorExchangeProvider.currentPrice
-DA:202,8
+FNDA:18,BancorExchangeProvider.currentPrice
+DA:202,20
 BRDA:202,4,0,1
-BRDA:202,4,1,7
-DA:206,7
-DA:207,7
-DA:208,7
-DA:211,7
-DA:212,7
+BRDA:202,4,1,19
+DA:206,19
+DA:207,19
+DA:208,19
+DA:211,19
+DA:212,19
 FN:221,BancorExchangeProvider.setBroker
 FNDA:3,BancorExchangeProvider.setBroker
-DA:222,90
+DA:222,96
 BRDA:222,5,0,1
-BRDA:222,5,1,89
-DA:223,89
-DA:224,89
+BRDA:222,5,1,95
+DA:223,95
+DA:224,95
 FN:231,BancorExchangeProvider.setReserve
 FNDA:3,BancorExchangeProvider.setReserve
-DA:232,90
+DA:232,96
 BRDA:232,6,0,1
-BRDA:232,6,1,89
-DA:233,89
-DA:234,89
+BRDA:232,6,1,95
+DA:233,95
+DA:234,95
 FN:242,BancorExchangeProvider.setExitContribution
 FNDA:4,BancorExchangeProvider.setExitContribution
 DA:246,3
@@ -93,26 +93,26 @@ DA:252,1
 DA:253,1
 DA:254,1
 FN:262,BancorExchangeProvider.createExchange
-FNDA:64,BancorExchangeProvider.createExchange
-DA:265,63
-DA:266,63
-DA:268,55
-DA:274,55
+FNDA:70,BancorExchangeProvider.createExchange
+DA:265,69
+DA:266,69
+DA:268,61
+DA:274,61
 BRDA:274,9,0,1
-BRDA:274,9,1,54
-DA:279,54
-DA:280,54
-DA:281,54
+BRDA:274,9,1,60
+DA:279,60
+DA:280,60
+DA:281,60
 BRDA:281,10,0,1
-BRDA:281,10,1,53
-DA:285,53
+BRDA:281,10,1,59
+DA:285,59
 BRDA:285,11,0,1
-BRDA:285,11,1,52
-DA:287,52
-DA:289,52
-DA:292,52
-DA:293,52
-DA:294,52
+BRDA:285,11,1,58
+DA:287,58
+DA:289,58
+DA:292,58
+DA:293,58
+DA:294,58
 FN:307,BancorExchangeProvider.destroyExchange
 FNDA:4,BancorExchangeProvider.destroyExchange
 DA:311,3
@@ -128,72 +128,72 @@ DA:323,1
 DA:324,1
 DA:326,1
 FN:341,BancorExchangeProvider.swapIn
-FNDA:8,BancorExchangeProvider.swapIn
-DA:347,7
-DA:348,6
-DA:349,6
-DA:355,3
-DA:357,3
-DA:358,3
+FNDA:10,BancorExchangeProvider.swapIn
+DA:347,9
+DA:348,8
+DA:349,8
+DA:355,5
+DA:357,5
+DA:358,5
 FN:369,BancorExchangeProvider.swapOut
-FNDA:8,BancorExchangeProvider.swapOut
-DA:375,7
-DA:376,6
-DA:378,6
-DA:384,3
-DA:386,3
-DA:387,3
+FNDA:10,BancorExchangeProvider.swapOut
+DA:375,9
+DA:376,8
+DA:378,8
+DA:384,5
+DA:386,5
+DA:387,5
 FN:400,BancorExchangeProvider.executeSwap
-FNDA:6,BancorExchangeProvider.executeSwap
-DA:406,6
-DA:407,6
-BRDA:407,14,0,4
-BRDA:407,14,1,2
-DA:408,4
-DA:409,4
-DA:411,2
-DA:412,2
-DA:414,6
-DA:415,6
+FNDA:10,BancorExchangeProvider.executeSwap
+DA:406,10
+DA:407,10
+BRDA:407,14,0,6
+BRDA:407,14,1,4
+DA:408,6
+DA:409,6
+DA:411,4
+DA:412,4
+DA:414,10
+DA:415,10
 FN:426,BancorExchangeProvider._getAmountIn
-FNDA:10,BancorExchangeProvider._getAmountIn
-DA:437,7
-BRDA:437,15,0,4
-BRDA:437,15,1,3
-DA:438,4
-DA:445,3
-DA:452,3
+FNDA:14,BancorExchangeProvider._getAmountIn
+DA:437,11
+BRDA:437,15,0,6
+BRDA:437,15,1,5
+DA:438,6
+DA:445,5
+DA:452,5
 FN:466,BancorExchangeProvider._getAmountOut
-FNDA:16,BancorExchangeProvider._getAmountOut
-DA:477,7
-BRDA:477,16,0,4
-BRDA:477,16,1,3
-DA:478,4
-DA:485,3
-DA:488,3
+FNDA:20,BancorExchangeProvider._getAmountOut
+DA:477,11
+BRDA:477,16,0,6
+BRDA:477,16,1,5
+DA:478,6
+DA:485,5
+DA:488,5
 FN:502,BancorExchangeProvider.validate
-FNDA:63,BancorExchangeProvider.validate
-DA:503,63
+FNDA:69,BancorExchangeProvider.validate
+DA:503,69
 BRDA:503,17,0,1
-BRDA:503,17,1,62
-DA:504,62
+BRDA:503,17,1,68
+DA:504,68
 BRDA:504,18,0,1
-BRDA:504,18,1,61
-DA:508,61
+BRDA:504,18,1,67
+DA:508,67
 BRDA:508,19,0,1
-BRDA:508,19,1,60
-DA:509,60
+BRDA:508,19,1,66
+DA:509,66
 BRDA:509,20,0,1
-BRDA:509,20,1,59
-DA:513,59
+BRDA:509,20,1,65
+DA:513,65
 BRDA:513,21,0,2
-BRDA:513,21,1,57
-DA:514,57
+BRDA:513,21,1,63
+DA:514,63
 BRDA:514,22,0,1
-BRDA:514,22,1,56
-DA:515,56
+BRDA:514,22,1,62
+DA:515,62
 BRDA:515,23,0,1
-BRDA:515,23,1,55
+BRDA:515,23,1,61
 FNF:22
 FNH:22
 LF:103
@@ -204,204 +204,204 @@ end_of_record
 TN:
 SF:contracts/BancorFormula.sol
 FN:39,BancorFormula.initMaxExpArray
-FNDA:88,BancorFormula.initMaxExpArray
-DA:72,88
-DA:73,88
-DA:74,88
-DA:75,88
-DA:76,88
-DA:77,88
-DA:78,88
-DA:79,88
-DA:80,88
-DA:81,88
-DA:82,88
-DA:83,88
-DA:84,88
-DA:85,88
-DA:86,88
-DA:87,88
-DA:88,88
-DA:89,88
-DA:90,88
-DA:91,88
-DA:92,88
-DA:93,88
-DA:94,88
-DA:95,88
-DA:96,88
-DA:97,88
-DA:98,88
-DA:99,88
-DA:100,88
-DA:101,88
-DA:102,88
-DA:103,88
-DA:104,88
-DA:105,88
-DA:106,88
-DA:107,88
-DA:108,88
-DA:109,88
-DA:110,88
-DA:111,88
-DA:112,88
-DA:113,88
-DA:114,88
-DA:115,88
-DA:116,88
-DA:117,88
-DA:118,88
-DA:119,88
-DA:120,88
-DA:121,88
-DA:122,88
-DA:123,88
-DA:124,88
-DA:125,88
-DA:126,88
-DA:127,88
-DA:128,88
-DA:129,88
-DA:130,88
-DA:131,88
-DA:132,88
-DA:133,88
-DA:134,88
-DA:135,88
-DA:136,88
-DA:137,88
-DA:138,88
-DA:139,88
-DA:140,88
-DA:141,88
-DA:142,88
-DA:143,88
-DA:144,88
-DA:145,88
-DA:146,88
-DA:147,88
-DA:148,88
-DA:149,88
-DA:150,88
-DA:151,88
-DA:152,88
-DA:153,88
-DA:154,88
-DA:155,88
-DA:156,88
-DA:157,88
-DA:158,88
-DA:159,88
-DA:160,88
-DA:161,88
-DA:162,88
-DA:163,88
-DA:164,88
-DA:165,88
-DA:166,88
-DA:167,88
+FNDA:94,BancorFormula.initMaxExpArray
+DA:72,94
+DA:73,94
+DA:74,94
+DA:75,94
+DA:76,94
+DA:77,94
+DA:78,94
+DA:79,94
+DA:80,94
+DA:81,94
+DA:82,94
+DA:83,94
+DA:84,94
+DA:85,94
+DA:86,94
+DA:87,94
+DA:88,94
+DA:89,94
+DA:90,94
+DA:91,94
+DA:92,94
+DA:93,94
+DA:94,94
+DA:95,94
+DA:96,94
+DA:97,94
+DA:98,94
+DA:99,94
+DA:100,94
+DA:101,94
+DA:102,94
+DA:103,94
+DA:104,94
+DA:105,94
+DA:106,94
+DA:107,94
+DA:108,94
+DA:109,94
+DA:110,94
+DA:111,94
+DA:112,94
+DA:113,94
+DA:114,94
+DA:115,94
+DA:116,94
+DA:117,94
+DA:118,94
+DA:119,94
+DA:120,94
+DA:121,94
+DA:122,94
+DA:123,94
+DA:124,94
+DA:125,94
+DA:126,94
+DA:127,94
+DA:128,94
+DA:129,94
+DA:130,94
+DA:131,94
+DA:132,94
+DA:133,94
+DA:134,94
+DA:135,94
+DA:136,94
+DA:137,94
+DA:138,94
+DA:139,94
+DA:140,94
+DA:141,94
+DA:142,94
+DA:143,94
+DA:144,94
+DA:145,94
+DA:146,94
+DA:147,94
+DA:148,94
+DA:149,94
+DA:150,94
+DA:151,94
+DA:152,94
+DA:153,94
+DA:154,94
+DA:155,94
+DA:156,94
+DA:157,94
+DA:158,94
+DA:159,94
+DA:160,94
+DA:161,94
+DA:162,94
+DA:163,94
+DA:164,94
+DA:165,94
+DA:166,94
+DA:167,94
 FN:173,BancorFormula.init
 FNDA:0,BancorFormula.init
-DA:174,88
+DA:174,94
 FN:191,BancorFormula.purchaseTargetAmount
-FNDA:4,BancorFormula.purchaseTargetAmount
-DA:198,4
+FNDA:6,BancorFormula.purchaseTargetAmount
+DA:198,6
 BRDA:198,0,0,-
-BRDA:198,0,1,4
-DA:199,4
+BRDA:198,0,1,6
+DA:199,6
 BRDA:199,1,0,-
-BRDA:199,1,1,4
-DA:200,4
+BRDA:199,1,1,6
+DA:200,6
 BRDA:200,2,0,-
-BRDA:200,2,1,4
-DA:203,4
-DA:206,4
-DA:208,4
-DA:209,4
-DA:210,4
-DA:211,4
-DA:212,4
-DA:213,4
+BRDA:200,2,1,6
+DA:203,6
+DA:206,6
+DA:208,6
+DA:209,6
+DA:210,6
+DA:211,6
+DA:212,6
+DA:213,6
 FN:230,BancorFormula.saleTargetAmount
-FNDA:3,BancorFormula.saleTargetAmount
-DA:237,3
+FNDA:5,BancorFormula.saleTargetAmount
+DA:237,5
 BRDA:237,5,0,-
-BRDA:237,5,1,3
-DA:238,3
+BRDA:237,5,1,5
+DA:238,5
 BRDA:238,6,0,-
-BRDA:238,6,1,3
-DA:239,3
+BRDA:238,6,1,5
+DA:239,5
 BRDA:239,7,0,-
-BRDA:239,7,1,3
-DA:240,3
+BRDA:239,7,1,5
+DA:240,5
 BRDA:240,8,0,-
-BRDA:240,8,1,3
-DA:243,3
-DA:246,3
-DA:249,3
-DA:251,3
-DA:252,3
-DA:253,3
-DA:254,3
-DA:255,3
-DA:256,3
-DA:257,3
+BRDA:240,8,1,5
+DA:243,5
+DA:246,5
+DA:249,5
+DA:251,5
+DA:252,5
+DA:253,5
+DA:254,5
+DA:255,5
+DA:256,5
+DA:257,5
 FN:274,BancorFormula.fundCost
-FNDA:4,BancorFormula.fundCost
-DA:281,4
+FNDA:6,BancorFormula.fundCost
+DA:281,6
 BRDA:281,12,0,-
-BRDA:281,12,1,4
-DA:282,4
+BRDA:281,12,1,6
+DA:282,6
 BRDA:282,13,0,-
-BRDA:282,13,1,4
-DA:283,4
+BRDA:282,13,1,6
+DA:283,6
 BRDA:283,14,0,-
-BRDA:283,14,1,4
-DA:286,4
-DA:289,4
-DA:291,4
-DA:292,4
-DA:293,4
-DA:294,4
-DA:295,4
-DA:296,4
+BRDA:283,14,1,6
+DA:286,6
+DA:289,6
+DA:291,6
+DA:292,6
+DA:293,6
+DA:294,6
+DA:295,6
+DA:296,6
 FN:313,BancorFormula.fundSupplyAmount
-FNDA:3,BancorFormula.fundSupplyAmount
-DA:320,3
+FNDA:5,BancorFormula.fundSupplyAmount
+DA:320,5
 BRDA:320,17,0,-
-BRDA:320,17,1,3
-DA:321,3
+BRDA:320,17,1,5
+DA:321,5
 BRDA:321,18,0,-
-BRDA:321,18,1,3
-DA:322,3
+BRDA:321,18,1,5
+DA:322,5
 BRDA:322,19,0,-
-BRDA:322,19,1,3
-DA:325,3
-DA:328,3
-DA:330,3
-DA:331,3
-DA:332,3
-DA:333,3
-DA:334,3
-DA:335,3
+BRDA:322,19,1,5
+DA:325,5
+DA:328,5
+DA:330,5
+DA:331,5
+DA:332,5
+DA:333,5
+DA:334,5
+DA:335,5
 FN:356,BancorFormula.power
-FNDA:14,BancorFormula.power
-DA:357,14
+FNDA:22,BancorFormula.power
+DA:357,22
 BRDA:357,22,0,-
-BRDA:357,22,1,14
-DA:359,14
-DA:360,14
-DA:361,14
-BRDA:361,23,0,14
+BRDA:357,22,1,22
+DA:359,22
+DA:360,22
+DA:361,22
+BRDA:361,23,0,22
 BRDA:361,23,1,-
-DA:362,14
+DA:362,22
 DA:364,0
-DA:367,14
-DA:368,14
-BRDA:368,24,0,14
+DA:367,22
+DA:368,22
+BRDA:368,24,0,22
 BRDA:368,24,1,-
-DA:369,14
+DA:369,22
 DA:371,0
 DA:372,0
 FN:380,BancorFormula.generalLog
@@ -521,201 +521,201 @@ DA:523,0
 DA:524,0
 DA:526,0
 FN:540,BancorFormula.optimalLog
-FNDA:14,BancorFormula.optimalLog
-DA:541,14
-DA:543,14
-DA:544,14
-DA:545,14
-DA:547,14
+FNDA:22,BancorFormula.optimalLog
+DA:541,22
+DA:543,22
+DA:544,22
+DA:545,22
+DA:547,22
 BRDA:547,34,0,-
 DA:548,0
 DA:549,0
-DA:551,14
+DA:551,22
 BRDA:551,35,0,-
 DA:552,0
 DA:553,0
-DA:555,14
+DA:555,22
 BRDA:555,36,0,-
 DA:556,0
 DA:557,0
-DA:559,14
+DA:559,22
 BRDA:559,37,0,-
 DA:560,0
 DA:561,0
-DA:563,14
+DA:563,22
 BRDA:563,38,0,-
 DA:564,0
 DA:565,0
-DA:567,14
-BRDA:567,39,0,-
-DA:568,0
-DA:569,0
-DA:571,14
+DA:567,22
+BRDA:567,39,0,4
+DA:568,4
+DA:569,4
+DA:571,22
 BRDA:571,40,0,-
 DA:572,0
 DA:573,0
-DA:575,14
+DA:575,22
 BRDA:575,41,0,-
 DA:576,0
 DA:577,0
-DA:580,14
-DA:581,14
-DA:582,14
-DA:583,14
-DA:584,14
-DA:585,14
-DA:586,14
-DA:587,14
-DA:588,14
-DA:589,14
-DA:590,14
-DA:591,14
-DA:592,14
-DA:593,14
-DA:594,14
-DA:595,14
-DA:596,14
-DA:598,14
+DA:580,22
+DA:581,22
+DA:582,22
+DA:583,22
+DA:584,22
+DA:585,22
+DA:586,22
+DA:587,22
+DA:588,22
+DA:589,22
+DA:590,22
+DA:591,22
+DA:592,22
+DA:593,22
+DA:594,22
+DA:595,22
+DA:596,22
+DA:598,22
 FN:612,BancorFormula.optimalExp
-FNDA:14,BancorFormula.optimalExp
-DA:613,14
-DA:615,14
-DA:616,14
-DA:618,14
-DA:619,14
-DA:620,14
-DA:621,14
-DA:622,14
-DA:623,14
-DA:624,14
-DA:625,14
-DA:626,14
-DA:627,14
-DA:628,14
-DA:629,14
-DA:630,14
-DA:631,14
-DA:632,14
-DA:633,14
-DA:634,14
-DA:635,14
-DA:636,14
-DA:637,14
-DA:638,14
-DA:639,14
-DA:640,14
-DA:641,14
-DA:642,14
-DA:643,14
-DA:644,14
-DA:645,14
-DA:646,14
-DA:647,14
-DA:648,14
-DA:649,14
-DA:650,14
-DA:651,14
-DA:652,14
-DA:653,14
-DA:654,14
-DA:655,14
-DA:656,14
-DA:657,14
-DA:659,14
+FNDA:22,BancorFormula.optimalExp
+DA:613,22
+DA:615,22
+DA:616,22
+DA:618,22
+DA:619,22
+DA:620,22
+DA:621,22
+DA:622,22
+DA:623,22
+DA:624,22
+DA:625,22
+DA:626,22
+DA:627,22
+DA:628,22
+DA:629,22
+DA:630,22
+DA:631,22
+DA:632,22
+DA:633,22
+DA:634,22
+DA:635,22
+DA:636,22
+DA:637,22
+DA:638,22
+DA:639,22
+DA:640,22
+DA:641,22
+DA:642,22
+DA:643,22
+DA:644,22
+DA:645,22
+DA:646,22
+DA:647,22
+DA:648,22
+DA:649,22
+DA:650,22
+DA:651,22
+DA:652,22
+DA:653,22
+DA:654,22
+DA:655,22
+DA:656,22
+DA:657,22
+DA:659,22
 DA:660,0
 BRDA:660,42,0,-
-DA:661,14
+DA:661,22
 DA:662,0
 BRDA:662,43,0,-
-DA:663,14
+DA:663,22
 DA:664,0
 BRDA:664,44,0,-
-DA:665,14
+DA:665,22
 DA:666,0
 BRDA:666,45,0,-
-DA:667,14
+DA:667,22
 DA:668,0
 BRDA:668,46,0,-
-DA:669,14
+DA:669,22
 DA:670,0
 BRDA:670,47,0,-
-DA:671,14
+DA:671,22
 DA:672,0
 BRDA:672,48,0,-
-DA:674,14
+DA:674,22
 FNF:13
 FNH:8
 LF:357
-LH:233
+LH:235
 BRF:57
-BRH:16
+BRH:17
 end_of_record
 TN:
 SF:contracts/GoodDollarExchangeProvider.sol
 FN:36,GoodDollarExchangeProvider.
-FNDA:25,GoodDollarExchangeProvider.
+FNDA:31,GoodDollarExchangeProvider.
 FN:45,GoodDollarExchangeProvider.initialize
-FNDA:25,GoodDollarExchangeProvider.initialize
-DA:51,25
-DA:52,25
-DA:54,25
-DA:55,25
+FNDA:31,GoodDollarExchangeProvider.initialize
+DA:51,31
+DA:52,31
+DA:54,31
+DA:55,31
 FN:60,GoodDollarExchangeProvider.onlyAvatar
 FNDA:2,GoodDollarExchangeProvider.onlyAvatar
 DA:61,2
 BRDA:61,0,0,1
 BRDA:61,0,1,2
 FN:65,GoodDollarExchangeProvider.onlyExpansionController
-FNDA:8,GoodDollarExchangeProvider.onlyExpansionController
-DA:66,8
+FNDA:9,GoodDollarExchangeProvider.onlyExpansionController
+DA:66,9
 BRDA:66,1,0,1
-BRDA:66,1,1,6
+BRDA:66,1,1,7
 FN:76,GoodDollarExchangeProvider.setAvatar
 FNDA:3,GoodDollarExchangeProvider.setAvatar
-DA:77,27
+DA:77,33
 BRDA:77,2,0,1
-BRDA:77,2,1,26
-DA:78,26
-DA:79,26
+BRDA:77,2,1,32
+DA:78,32
+DA:79,32
 FN:86,GoodDollarExchangeProvider.setExpansionController
 FNDA:3,GoodDollarExchangeProvider.setExpansionController
-DA:87,27
+DA:87,33
 BRDA:87,3,0,1
-BRDA:87,3,1,26
-DA:88,26
-DA:89,26
+BRDA:87,3,1,32
+DA:88,32
+DA:89,32
 FN:100,GoodDollarExchangeProvider.swapIn
-FNDA:2,GoodDollarExchangeProvider.swapIn
-DA:106,1
+FNDA:4,GoodDollarExchangeProvider.swapIn
+DA:106,3
 FN:117,GoodDollarExchangeProvider.swapOut
-FNDA:2,GoodDollarExchangeProvider.swapOut
-DA:123,1
+FNDA:4,GoodDollarExchangeProvider.swapOut
+DA:123,3
 FN:135,GoodDollarExchangeProvider.mintFromExpansion
-FNDA:8,GoodDollarExchangeProvider.mintFromExpansion
-DA:139,6
+FNDA:9,GoodDollarExchangeProvider.mintFromExpansion
+DA:139,7
 BRDA:139,4,0,1
-BRDA:139,4,1,5
-DA:140,5
-DA:142,4
-DA:143,4
-DA:145,4
-DA:146,4
-DA:148,4
-DA:149,4
-DA:151,4
-DA:152,4
-DA:154,4
-DA:155,4
-DA:156,4
+BRDA:139,4,1,6
+DA:140,6
+DA:142,5
+DA:143,5
+DA:145,5
+DA:146,5
+DA:148,5
+DA:149,5
+DA:151,5
+DA:152,5
+DA:154,5
+DA:155,5
+DA:156,5
 FN:168,GoodDollarExchangeProvider.mintFromInterest
-FNDA:7,GoodDollarExchangeProvider.mintFromInterest
-DA:172,5
-DA:174,4
-DA:175,4
-DA:178,4
-DA:180,4
-DA:181,4
-DA:183,4
+FNDA:8,GoodDollarExchangeProvider.mintFromInterest
+DA:172,6
+DA:174,5
+DA:175,5
+DA:178,5
+DA:180,5
+DA:181,5
+DA:183,5
 FN:193,GoodDollarExchangeProvider.updateRatioForReward
 FNDA:5,GoodDollarExchangeProvider.updateRatioForReward
 DA:194,3
@@ -747,84 +747,84 @@ end_of_record
 TN:
 SF:contracts/GoodDollarExpansionController.sol
 FN:55,GoodDollarExpansionController.
-FNDA:34,GoodDollarExpansionController.
+FNDA:40,GoodDollarExpansionController.
 DA:56,0
 BRDA:56,0,0,-
 DA:57,0
 FN:68,GoodDollarExpansionController.initialize
-FNDA:34,GoodDollarExpansionController.initialize
-DA:74,34
-DA:75,34
-DA:77,34
-DA:78,34
-DA:79,34
-DA:80,34
+FNDA:40,GoodDollarExpansionController.initialize
+DA:74,40
+DA:75,40
+DA:77,40
+DA:78,40
+DA:79,40
+DA:80,40
 FN:85,GoodDollarExpansionController.onlyAvatar
 FNDA:4,GoodDollarExpansionController.onlyAvatar
 DA:86,4
 BRDA:86,1,0,1
-BRDA:86,1,1,19
+BRDA:86,1,1,25
 FN:97,GoodDollarExpansionController.getExpansionConfig
 FNDA:10,GoodDollarExpansionController.getExpansionConfig
-DA:100,19
+DA:100,20
 BRDA:100,2,0,2
-BRDA:100,2,1,17
-DA:104,17
+BRDA:100,2,1,18
+DA:104,18
 FN:113,GoodDollarExpansionController.setGoodDollarExchangeProvider
 FNDA:3,GoodDollarExpansionController.setGoodDollarExchangeProvider
-DA:116,36
+DA:116,42
 BRDA:116,3,0,1
-BRDA:116,3,1,35
-DA:120,35
-DA:123,35
+BRDA:116,3,1,41
+DA:120,41
+DA:123,41
 FN:130,GoodDollarExpansionController.setDistributionHelper
 FNDA:3,GoodDollarExpansionController.setDistributionHelper
-DA:133,36
+DA:133,42
 BRDA:133,4,0,1
-BRDA:133,4,1,35
-DA:137,35
-DA:138,35
+BRDA:133,4,1,41
+DA:137,41
+DA:138,41
 FN:145,GoodDollarExpansionController.setReserve
 FNDA:3,GoodDollarExpansionController.setReserve
-DA:146,36
+DA:146,42
 BRDA:146,5,0,1
-BRDA:146,5,1,35
-DA:147,35
-DA:148,35
+BRDA:146,5,1,41
+DA:147,41
+DA:148,41
 FN:155,GoodDollarExpansionController.setAvatar
 FNDA:3,GoodDollarExpansionController.setAvatar
-DA:156,36
+DA:156,42
 BRDA:156,6,0,1
-BRDA:156,6,1,35
-DA:157,35
-DA:158,35
+BRDA:156,6,1,41
+DA:157,41
+DA:158,41
 FN:167,GoodDollarExpansionController.setExpansionConfig
-FNDA:20,GoodDollarExpansionController.setExpansionConfig
-DA:172,19
+FNDA:26,GoodDollarExpansionController.setExpansionConfig
+DA:172,25
 BRDA:172,7,0,1
-BRDA:172,7,1,18
-DA:176,18
+BRDA:172,7,1,24
+DA:176,24
 BRDA:176,8,0,1
-BRDA:176,8,1,17
-DA:177,17
+BRDA:176,8,1,23
+DA:177,23
 BRDA:177,9,0,1
-BRDA:177,9,1,16
-DA:182,16
-DA:183,16
-DA:186,16
+BRDA:177,9,1,22
+DA:182,22
+DA:183,22
+DA:186,22
 FN:194,GoodDollarExpansionController.mintUBIFromInterest
-FNDA:2,GoodDollarExpansionController.mintUBIFromInterest
-DA:198,2
+FNDA:3,GoodDollarExpansionController.mintUBIFromInterest
+DA:198,3
 BRDA:198,10,0,1
-BRDA:198,10,1,1
-DA:199,1
-DA:200,1
-DA:204,1
-DA:209,1
+BRDA:198,10,1,2
+DA:199,2
+DA:200,2
+DA:204,2
+DA:209,2
 BRDA:209,11,0,-
-BRDA:209,11,1,1
-DA:217,1
-DA:221,1
+BRDA:209,11,1,2
+DA:217,2
+DA:221,2
 FN:229,GoodDollarExpansionController.mintUBIFromReserveBalance
 FNDA:2,GoodDollarExpansionController.mintUBIFromReserveBalance
 DA:232,2
@@ -837,27 +837,27 @@ DA:242,1
 DA:246,1
 DA:251,1
 FN:260,GoodDollarExpansionController.mintUBIFromExpansion
-FNDA:9,GoodDollarExpansionController.mintUBIFromExpansion
-DA:263,9
-DA:264,8
-DA:265,8
-DA:269,8
-DA:270,8
-DA:271,8
-BRDA:271,13,0,7
-DA:272,7
-DA:275,7
-BRDA:275,14,0,5
+FNDA:10,GoodDollarExpansionController.mintUBIFromExpansion
+DA:263,10
+DA:264,9
+DA:265,9
+DA:269,9
+DA:270,9
+DA:271,9
+BRDA:271,13,0,8
+DA:272,8
+DA:275,8
+BRDA:275,14,0,6
 BRDA:275,14,1,2
-DA:276,5
+DA:276,6
 DA:278,2
-DA:283,7
-DA:284,7
-DA:288,7
-DA:291,7
-DA:296,7
-DA:300,7
-DA:301,7
+DA:283,8
+DA:284,8
+DA:288,8
+DA:291,8
+DA:296,8
+DA:300,8
+DA:301,8
 FN:311,GoodDollarExpansionController.mintRewardFromRR
 FNDA:4,GoodDollarExpansionController.mintRewardFromRR
 DA:316,3
@@ -881,22 +881,22 @@ end_of_record
 TN:
 SF:contracts/common/SafeERC20MintableBurnable.sol
 FN:18,SafeERC20MintableBurnable.safeTransferFrom
-FNDA:6,SafeERC20MintableBurnable.safeTransferFrom
-DA:19,6
+FNDA:10,SafeERC20MintableBurnable.safeTransferFrom
+DA:19,10
 FN:22,SafeERC20MintableBurnable.safeMint
-FNDA:3,SafeERC20MintableBurnable.safeMint
-DA:23,3
+FNDA:5,SafeERC20MintableBurnable.safeMint
+DA:23,5
 FN:26,SafeERC20MintableBurnable.safeBurn
-FNDA:3,SafeERC20MintableBurnable.safeBurn
-DA:27,3
+FNDA:5,SafeERC20MintableBurnable.safeBurn
+DA:27,5
 FN:36,SafeERC20MintableBurnable._callOptionalReturn
-FNDA:12,SafeERC20MintableBurnable._callOptionalReturn
-DA:41,12
-DA:42,12
-BRDA:42,0,0,12
-DA:44,12
+FNDA:20,SafeERC20MintableBurnable._callOptionalReturn
+DA:41,20
+DA:42,20
+BRDA:42,0,0,18
+DA:44,18
 BRDA:44,1,0,-
-BRDA:44,1,1,12
+BRDA:44,1,1,18
 FNF:4
 FNH:4
 LF:6
@@ -905,6 +905,50 @@ BRF:3
 BRH:2
 end_of_record
 TN:
+SF:contracts/common/UsingRegistry.sol
+FN:40,UsingRegistry.onlyRegisteredContract
+FNDA:0,UsingRegistry.onlyRegisteredContract
+DA:41,0
+BRDA:41,0,0,-
+BRDA:41,0,1,-
+FN:45,UsingRegistry.onlyRegisteredContracts
+FNDA:0,UsingRegistry.onlyRegisteredContracts
+DA:46,0
+BRDA:46,1,0,-
+BRDA:46,1,1,-
+FN:54,UsingRegistry.setRegistry
+FNDA:0,UsingRegistry.setRegistry
+DA:55,6
+BRDA:55,2,0,-
+BRDA:55,2,1,6
+DA:56,6
+DA:57,6
+FN:60,UsingRegistry.getExchange
+FNDA:0,UsingRegistry.getExchange
+DA:61,0
+FN:64,UsingRegistry.getFreezer
+FNDA:0,UsingRegistry.getFreezer
+DA:65,0
+FN:68,UsingRegistry.getGoldToken
+FNDA:0,UsingRegistry.getGoldToken
+DA:69,0
+FN:72,UsingRegistry.getReserve
+FNDA:0,UsingRegistry.getReserve
+DA:73,0
+FN:76,UsingRegistry.getSortedOracles
+FNDA:0,UsingRegistry.getSortedOracles
+DA:77,0
+FN:80,UsingRegistry.getStableToken
+FNDA:0,UsingRegistry.getStableToken
+DA:81,0
+FNF:9
+FNH:0
+LF:11
+LH:3
+BRF:6
+BRH:1
+end_of_record
+TN:
 SF:contracts/libraries/TradingLimits.sol
 FN:54,TradingLimits.validate
 FNDA:14,TradingLimits.validate
@@ -1006,12 +1050,12 @@ end_of_record
 TN:
 SF:contracts/swap/Broker.sol
 FN:55,Broker.
-FNDA:30,Broker.
+FNDA:36,Broker.
 FN:62,Broker.initialize
-FNDA:30,Broker.initialize
-DA:63,30
-DA:64,30
-DA:65,90
+FNDA:36,Broker.initialize
+DA:63,36
+DA:64,36
+DA:65,96
 FN:74,Broker.setReserves
 FNDA:4,Broker.setReserves
 DA:78,3
@@ -1025,21 +1069,21 @@ DA:81,2
 DA:82,2
 FN:94,Broker.addExchangeProvider
 FNDA:5,Broker.addExchangeProvider
-DA:98,94
+DA:98,100
 BRDA:98,2,0,1
-BRDA:98,2,1,93
-DA:99,93
+BRDA:98,2,1,99
+DA:99,99
 BRDA:99,3,0,1
-BRDA:99,3,1,92
-DA:100,92
+BRDA:99,3,1,98
+DA:100,98
 BRDA:100,4,0,1
-BRDA:100,4,1,91
-DA:101,91
-DA:102,91
-DA:103,91
-DA:104,91
-DA:105,91
-DA:106,91
+BRDA:100,4,1,97
+DA:101,97
+DA:102,97
+DA:103,97
+DA:104,97
+DA:105,97
+DA:106,97
 FN:114,Broker.removeExchangeProvider
 FNDA:4,Broker.removeExchangeProvider
 DA:118,3
@@ -1051,45 +1095,45 @@ DA:121,1
 DA:122,1
 DA:123,1
 FN:135,Broker.getAmountIn
-FNDA:2,Broker.getAmountIn
-DA:142,2
+FNDA:4,Broker.getAmountIn
+DA:142,4
 BRDA:142,6,0,1
-BRDA:142,6,1,1
-DA:143,1
+BRDA:142,6,1,3
+DA:143,3
 FN:155,Broker.getAmountOut
-FNDA:2,Broker.getAmountOut
-DA:162,2
+FNDA:4,Broker.getAmountOut
+DA:162,4
 BRDA:162,7,0,1
-BRDA:162,7,1,1
-DA:163,1
+BRDA:162,7,1,3
+DA:163,3
 FN:176,Broker.swapIn
-FNDA:5,Broker.swapIn
-DA:184,5
+FNDA:7,Broker.swapIn
+DA:184,7
 BRDA:184,8,0,-
-BRDA:184,8,1,5
-DA:186,5
-DA:187,5
+BRDA:184,8,1,7
+DA:186,7
+DA:187,7
 BRDA:187,9,0,1
-BRDA:187,9,1,4
-DA:188,4
-DA:190,3
-DA:191,3
-DA:192,3
-DA:193,3
+BRDA:187,9,1,6
+DA:188,6
+DA:190,5
+DA:191,5
+DA:192,5
+DA:193,5
 FN:206,Broker.swapOut
-FNDA:4,Broker.swapOut
-DA:214,4
+FNDA:6,Broker.swapOut
+DA:214,6
 BRDA:214,10,0,1
-BRDA:214,10,1,3
-DA:216,3
-DA:217,3
+BRDA:214,10,1,5
+DA:216,5
+DA:217,5
 BRDA:217,11,0,1
-BRDA:217,11,1,2
-DA:218,2
-DA:220,2
-DA:221,2
-DA:222,2
-DA:223,2
+BRDA:217,11,1,4
+DA:218,4
+DA:220,4
+DA:221,4
+DA:222,4
+DA:223,4
 FN:232,Broker.burnStableTokens
 FNDA:1,Broker.burnStableTokens
 DA:233,1
@@ -1103,48 +1147,48 @@ DA:258,2
 DA:259,2
 DA:260,2
 FN:274,Broker.transferOut
-FNDA:5,Broker.transferOut
-DA:275,5
-DA:276,5
-BRDA:276,12,0,3
-BRDA:276,12,1,2
-DA:277,3
-DA:278,2
-BRDA:278,13,0,2
-BRDA:278,13,1,2
-DA:279,2
+FNDA:9,Broker.transferOut
+DA:275,9
+DA:276,9
+BRDA:276,12,0,5
+BRDA:276,12,1,4
+DA:277,5
+DA:278,4
+BRDA:278,13,0,4
+BRDA:278,13,1,4
+DA:279,4
 BRDA:279,14,0,-
-BRDA:279,14,1,2
+BRDA:279,14,1,4
 DA:281,0
 FN:294,Broker.transferIn
-FNDA:5,Broker.transferIn
-DA:295,5
-DA:296,5
-BRDA:296,15,0,2
+FNDA:9,Broker.transferIn
+DA:295,9
+DA:296,9
+BRDA:296,15,0,4
 BRDA:296,15,1,-
-DA:297,2
-DA:298,2
-DA:299,3
-BRDA:299,16,0,3
+DA:297,4
+DA:298,4
+DA:299,5
+BRDA:299,16,0,5
 BRDA:299,16,1,-
-DA:300,3
+DA:300,5
 DA:302,0
 FN:315,Broker.guardTradingLimits
-FNDA:6,Broker.guardTradingLimits
-DA:322,6
-DA:323,6
-DA:324,6
+FNDA:10,Broker.guardTradingLimits
+DA:322,10
+DA:323,10
+DA:324,10
 BRDA:324,17,0,-
-BRDA:324,17,1,6
-DA:325,6
+BRDA:324,17,1,10
+DA:325,10
 BRDA:325,18,0,-
-BRDA:325,18,1,6
-DA:327,6
-DA:328,5
+BRDA:325,18,1,10
+DA:327,10
+DA:328,9
 FN:338,Broker.guardTradingLimit
-FNDA:11,Broker.guardTradingLimit
-DA:339,11
-DA:340,11
+FNDA:19,Broker.guardTradingLimit
+DA:339,19
+DA:340,19
 BRDA:340,19,0,2
 DA:341,2
 DA:342,2
@@ -1161,39 +1205,553 @@ BRF:39
 BRH:33
 end_of_record
 TN:
+SF:contracts/swap/Reserve.sol
+FN:109,Reserve.
+FNDA:6,Reserve.
+FN:111,Reserve.isStableToken
+FNDA:0,Reserve.isStableToken
+DA:112,0
+BRDA:112,0,0,-
+BRDA:112,0,1,-
+FN:123,Reserve.getVersionNumber
+FNDA:0,Reserve.getVersionNumber
+DA:128,0
+FN:131,Reserve.
+FNDA:0,Reserve.
+FN:148,Reserve.initialize
+FNDA:6,Reserve.initialize
+DA:161,6
+DA:162,6
+DA:163,6
+DA:164,6
+DA:165,6
+DA:166,6
+DA:167,6
+DA:168,6
+DA:169,6
+DA:170,6
+DA:172,6
+FN:182,Reserve.setTobinTaxStalenessThreshold
+FNDA:0,Reserve.setTobinTaxStalenessThreshold
+DA:183,6
+BRDA:183,1,0,-
+BRDA:183,1,1,6
+DA:184,6
+DA:185,6
+FN:192,Reserve.setTobinTax
+FNDA:0,Reserve.setTobinTax
+DA:193,6
+BRDA:193,2,0,-
+BRDA:193,2,1,6
+DA:197,6
+DA:198,6
+FN:205,Reserve.setTobinTaxReserveRatio
+FNDA:0,Reserve.setTobinTaxReserveRatio
+DA:206,6
+DA:207,6
+FN:214,Reserve.setDailySpendingRatio
+FNDA:0,Reserve.setDailySpendingRatio
+DA:215,6
+DA:216,6
+BRDA:216,3,0,-
+BRDA:216,3,1,6
+DA:220,6
+FN:231,Reserve.setDailySpendingRatioForCollateralAssets
+FNDA:0,Reserve.setDailySpendingRatioForCollateralAssets
+DA:235,6
+BRDA:235,4,0,-
+BRDA:235,4,1,6
+DA:240,6
+DA:242,6
+DA:243,6
+DA:244,6
+BRDA:244,5,0,6
+DA:245,6
+BRDA:245,6,0,-
+BRDA:245,6,1,6
+DA:249,6
+BRDA:249,7,0,-
+BRDA:249,7,1,6
+DA:255,6
+DA:258,6
+FN:270,Reserve.getDailySpendingRatio
+FNDA:0,Reserve.getDailySpendingRatio
+DA:271,0
+FN:279,Reserve.getDailySpendingRatioForCollateralAsset
+FNDA:0,Reserve.getDailySpendingRatioForCollateralAsset
+DA:282,0
+FN:290,Reserve.setFrozenGold
+FNDA:0,Reserve.setFrozenGold
+DA:294,6
+BRDA:294,8,0,-
+BRDA:294,8,1,6
+DA:298,6
+DA:300,6
+DA:301,6
+FN:310,Reserve.setAssetAllocations
+FNDA:0,Reserve.setAssetAllocations
+DA:314,6
+BRDA:314,9,0,-
+BRDA:314,9,1,6
+DA:315,6
+DA:316,6
+DA:317,12
+DA:319,6
+BRDA:319,10,0,-
+BRDA:319,10,1,6
+DA:324,6
+DA:325,0
+DA:327,6
+DA:328,6
+DA:329,12
+BRDA:329,11,0,-
+BRDA:329,11,1,12
+DA:333,12
+DA:340,6
+BRDA:340,12,0,-
+BRDA:340,12,1,6
+DA:344,6
+FN:352,Reserve.addToken
+FNDA:6,Reserve.addToken
+DA:353,6
+BRDA:353,13,0,-
+BRDA:353,13,1,6
+DA:354,6
+DA:355,6
+DA:356,6
+DA:357,6
+FN:366,Reserve.removeToken
+FNDA:0,Reserve.removeToken
+DA:370,0
+BRDA:370,14,0,-
+BRDA:370,14,1,-
+DA:374,0
+DA:375,0
+DA:376,0
+DA:377,0
+DA:378,0
+DA:379,0
+FN:387,Reserve.addOtherReserveAddress
+FNDA:0,Reserve.addOtherReserveAddress
+DA:390,0
+BRDA:390,15,0,-
+BRDA:390,15,1,-
+DA:394,0
+DA:395,0
+DA:396,0
+DA:397,0
+FN:406,Reserve.removeOtherReserveAddress
+FNDA:0,Reserve.removeOtherReserveAddress
+DA:410,0
+BRDA:410,16,0,-
+BRDA:410,16,1,-
+DA:414,0
+BRDA:414,17,0,-
+BRDA:414,17,1,-
+DA:419,0
+DA:420,0
+DA:423,0
+DA:424,0
+DA:425,0
+DA:426,0
+FN:433,Reserve.addSpender
+FNDA:0,Reserve.addSpender
+DA:434,0
+BRDA:434,18,0,-
+BRDA:434,18,1,-
+DA:435,0
+DA:436,0
+FN:443,Reserve.removeSpender
+FNDA:0,Reserve.removeSpender
+DA:444,0
+BRDA:444,19,0,-
+BRDA:444,19,1,-
+DA:445,0
+DA:446,0
+FN:456,Reserve.isAllowedToSpendExchange
+FNDA:0,Reserve.isAllowedToSpendExchange
+DA:457,0
+BRDA:457,20,0,-
+BRDA:457,20,1,-
+FN:469,Reserve.addExchangeSpender
+FNDA:6,Reserve.addExchangeSpender
+DA:470,6
+BRDA:470,21,0,-
+BRDA:470,21,1,6
+DA:471,6
+BRDA:471,22,0,-
+BRDA:471,22,1,6
+DA:475,6
+DA:476,6
+DA:477,6
+FN:485,Reserve.removeExchangeSpender
+FNDA:0,Reserve.removeExchangeSpender
+DA:489,0
+DA:490,0
+DA:491,0
+BRDA:491,23,0,-
+BRDA:491,23,1,-
+DA:492,0
+BRDA:492,24,0,-
+BRDA:492,24,1,-
+DA:496,0
+DA:498,0
+BRDA:498,25,0,-
+DA:499,0
+DA:504,0
+DA:505,0
+DA:506,0
+FN:515,Reserve.getExchangeSpenders
+FNDA:0,Reserve.getExchangeSpenders
+DA:516,0
+FN:525,Reserve.transferGold
+FNDA:0,Reserve.transferGold
+DA:529,0
+BRDA:529,26,0,-
+BRDA:529,26,1,-
+DA:533,0
+BRDA:533,27,0,-
+BRDA:533,27,1,-
+DA:537,0
+DA:538,0
+BRDA:538,28,0,-
+DA:539,0
+DA:540,0
+DA:541,0
+DA:545,0
+BRDA:545,29,0,-
+BRDA:545,29,1,-
+DA:546,0
+DA:547,0
+FN:558,Reserve.transferCollateralAsset
+FNDA:0,Reserve.transferCollateralAsset
+DA:563,0
+BRDA:563,30,0,-
+BRDA:563,30,1,-
+DA:567,0
+BRDA:567,31,0,-
+BRDA:567,31,1,-
+DA:571,0
+BRDA:571,32,0,-
+BRDA:571,32,1,-
+DA:575,0
+DA:576,0
+BRDA:576,33,0,-
+DA:577,0
+DA:580,0
+DA:581,0
+DA:587,0
+DA:590,0
+BRDA:590,34,0,-
+BRDA:590,34,1,-
+DA:592,0
+DA:595,0
+FN:605,Reserve._transferCollateralAsset
+FNDA:2,Reserve._transferCollateralAsset
+DA:610,2
+BRDA:610,35,0,-
+BRDA:610,35,1,2
+DA:615,2
+DA:616,2
+DA:622,2
+FN:633,Reserve.transferExchangeCollateralAsset
+FNDA:2,Reserve.transferExchangeCollateralAsset
+DA:638,2
+BRDA:638,36,0,-
+BRDA:638,36,1,2
+DA:639,2
+FN:648,Reserve._transferGold
+FNDA:0,Reserve._transferGold
+DA:652,0
+BRDA:652,37,0,-
+BRDA:652,37,1,-
+DA:654,0
+DA:655,0
+DA:656,0
+FN:666,Reserve.transferExchangeGold
+FNDA:0,Reserve.transferExchangeGold
+DA:670,0
+FN:678,Reserve.getOrComputeTobinTax
+FNDA:0,Reserve.getOrComputeTobinTax
+DA:684,0
+BRDA:684,38,0,-
+DA:685,0
+DA:686,0
+DA:688,0
+FN:698,Reserve.getTokens
+FNDA:0,Reserve.getTokens
+DA:699,0
+FN:706,Reserve.getOtherReserveAddresses
+FNDA:0,Reserve.getOtherReserveAddresses
+DA:711,0
+FN:718,Reserve.getAssetAllocationSymbols
+FNDA:0,Reserve.getAssetAllocationSymbols
+DA:723,0
+FN:730,Reserve.getAssetAllocationWeights
+FNDA:0,Reserve.getAssetAllocationWeights
+DA:735,0
+DA:737,0
+DA:738,0
+DA:740,0
+FN:747,Reserve.getUnfrozenBalance
+FNDA:0,Reserve.getUnfrozenBalance
+DA:748,0
+DA:749,0
+DA:750,0
+FN:757,Reserve.getReserveGoldBalance
+FNDA:0,Reserve.getReserveGoldBalance
+DA:758,0
+FN:765,Reserve.getOtherReserveAddressesGoldBalance
+FNDA:0,Reserve.getOtherReserveAddressesGoldBalance
+DA:770,0
+DA:772,0
+DA:773,0
+DA:777,0
+FN:784,Reserve.getUnfrozenReserveGoldBalance
+FNDA:0,Reserve.getUnfrozenReserveGoldBalance
+DA:785,0
+FN:794,Reserve.getReserveAddressesCollateralAssetBalance
+FNDA:0,Reserve.getReserveAddressesCollateralAssetBalance
+DA:797,2
+BRDA:797,39,0,-
+BRDA:797,39,1,2
+DA:801,2
+DA:803,2
+DA:805,0
+DA:809,2
+DA:810,2
+FN:820,Reserve.addCollateralAsset
+FNDA:0,Reserve.addCollateralAsset
+DA:823,6
+BRDA:823,40,0,-
+BRDA:823,40,1,6
+DA:827,6
+BRDA:827,41,0,-
+BRDA:827,41,1,6
+DA:828,6
+DA:829,6
+DA:830,6
+DA:831,6
+FN:840,Reserve.removeCollateralAsset
+FNDA:0,Reserve.removeCollateralAsset
+DA:844,0
+BRDA:844,42,0,-
+BRDA:844,42,1,-
+DA:848,0
+BRDA:848,43,0,-
+BRDA:848,43,1,-
+DA:853,0
+DA:856,0
+DA:857,0
+DA:858,0
+DA:859,0
+FN:867,Reserve.checkIsCollateralAsset
+FNDA:0,Reserve.checkIsCollateralAsset
+DA:870,14
+FN:877,Reserve.getFrozenReserveGoldBalance
+FNDA:0,Reserve.getFrozenReserveGoldBalance
+DA:878,0
+DA:879,0
+DA:880,0
+DA:881,0
+DA:882,0
+FN:893,Reserve.getReserveRatio
+FNDA:0,Reserve.getReserveRatio
+DA:894,0
+DA:897,0
+DA:898,0
+DA:899,0
+DA:900,0
+DA:905,0
+DA:906,0
+DA:907,0
+DA:909,0
+DA:911,0
+BRDA:911,45,0,-
+DA:914,0
+DA:915,0
+DA:918,0
+DA:923,0
+DA:924,0
+FN:939,Reserve.computeTobinTax
+FNDA:0,Reserve.computeTobinTax
+DA:944,0
+DA:945,0
+BRDA:945,46,0,-
+BRDA:945,46,1,-
+DA:946,0
+DA:948,0
+FN:952,Reserve.isStableAsset
+FNDA:20,Reserve.isStableAsset
+DA:953,20
+FNF:47
+FNH:7
+LF:198
+LH:76
+BRF:86
+BRH:20
+end_of_record
+TN:
 SF:node_modules/@celo/contracts/common/FixidityLib.sol
 FN:26,FixidityLib.digits
 FNDA:0,FixidityLib.digits
 DA:27,0
 FN:37,FixidityLib.fixed1
+FNDA:24,FixidityLib.fixed1
+DA:38,24
+FN:47,FixidityLib.wrap
+FNDA:42,FixidityLib.wrap
+DA:48,42
+FN:54,FixidityLib.unwrap
+FNDA:0,FixidityLib.unwrap
+DA:55,0
+FN:62,FixidityLib.mulPrecision
+FNDA:0,FixidityLib.mulPrecision
+DA:63,0
+FN:71,FixidityLib.maxNewFixed
+FNDA:0,FixidityLib.maxNewFixed
+DA:72,0
+FN:82,FixidityLib.newFixed
+FNDA:0,FixidityLib.newFixed
+DA:83,0
+BRDA:83,0,0,-
+BRDA:83,0,1,-
+DA:84,0
+FN:91,FixidityLib.fromFixed
+FNDA:0,FixidityLib.fromFixed
+DA:92,0
+FN:106,FixidityLib.newFixedFraction
+FNDA:0,FixidityLib.newFixedFraction
+DA:111,0
+DA:112,0
+DA:113,0
+FN:123,FixidityLib.integer
+FNDA:0,FixidityLib.integer
+DA:124,0
+FN:135,FixidityLib.fractional
+FNDA:0,FixidityLib.fractional
+DA:136,0
+FN:147,FixidityLib.add
+FNDA:12,FixidityLib.add
+DA:148,12
+DA:149,12
+BRDA:149,1,0,-
+BRDA:149,1,1,12
+DA:150,12
+FN:158,FixidityLib.subtract
+FNDA:0,FixidityLib.subtract
+DA:159,0
+BRDA:159,2,0,-
+BRDA:159,2,1,-
+DA:160,0
+FN:176,FixidityLib.multiply
+FNDA:0,FixidityLib.multiply
+DA:177,0
+DA:178,0
+DA:179,0
+DA:183,0
+DA:184,0
+DA:185,0
+DA:186,0
+DA:189,0
+DA:190,0
+BRDA:190,6,0,-
+BRDA:190,7,0,-
+BRDA:190,7,1,-
+DA:194,0
+DA:195,0
+BRDA:195,8,0,-
+BRDA:195,9,0,-
+BRDA:195,9,1,-
+DA:196,0
+DA:198,0
+DA:199,0
+BRDA:199,10,0,-
+BRDA:199,11,0,-
+BRDA:199,11,1,-
+DA:201,0
+DA:202,0
+BRDA:202,12,0,-
+BRDA:202,13,0,-
+BRDA:202,13,1,-
+DA:204,0
+DA:205,0
+DA:206,0
+DA:207,0
+BRDA:207,14,0,-
+BRDA:207,15,0,-
+BRDA:207,15,1,-
+DA:210,0
+DA:211,0
+DA:212,0
+DA:213,0
+DA:214,0
+FN:226,FixidityLib.reciprocal
+FNDA:0,FixidityLib.reciprocal
+DA:227,0
+BRDA:227,16,0,-
+BRDA:227,16,1,-
+DA:228,0
+FN:244,FixidityLib.divide
+FNDA:0,FixidityLib.divide
+DA:245,0
+BRDA:245,17,0,-
+BRDA:245,17,1,-
+DA:246,0
+DA:247,0
+BRDA:247,18,0,-
+BRDA:247,18,1,-
+DA:248,0
+FN:254,FixidityLib.gt
+FNDA:0,FixidityLib.gt
+DA:255,0
+FN:261,FixidityLib.gte
+FNDA:0,FixidityLib.gte
+DA:262,0
+FN:268,FixidityLib.lt
+FNDA:0,FixidityLib.lt
+DA:269,0
+FN:275,FixidityLib.lte
+FNDA:18,FixidityLib.lte
+DA:276,18
+FN:282,FixidityLib.equals
+FNDA:6,FixidityLib.equals
+DA:283,6
+FN:289,FixidityLib.isProperFraction
+FNDA:0,FixidityLib.isProperFraction
+DA:290,0
+FN:26,FixidityLib.digits
+FNDA:0,FixidityLib.digits
+DA:27,0
+FN:37,FixidityLib.fixed1
 FNDA:13,FixidityLib.fixed1
 DA:38,13
 FN:47,FixidityLib.wrap
 FNDA:27,FixidityLib.wrap
 DA:48,27
 FN:54,FixidityLib.unwrap
-FNDA:26,FixidityLib.unwrap
-DA:55,26
+FNDA:50,FixidityLib.unwrap
+DA:55,50
 FN:62,FixidityLib.mulPrecision
 FNDA:28,FixidityLib.mulPrecision
 DA:63,28
 FN:71,FixidityLib.maxNewFixed
-FNDA:40,FixidityLib.maxNewFixed
-DA:72,40
+FNDA:88,FixidityLib.maxNewFixed
+DA:72,88
 FN:82,FixidityLib.newFixed
-FNDA:40,FixidityLib.newFixed
-DA:83,40
+FNDA:88,FixidityLib.newFixed
+DA:83,88
 BRDA:83,0,0,-
-BRDA:83,0,1,40
-DA:84,40
+BRDA:83,0,1,88
+DA:84,88
 FN:91,FixidityLib.fromFixed
 FNDA:14,FixidityLib.fromFixed
 DA:92,14
 FN:106,FixidityLib.newFixedFraction
-FNDA:13,FixidityLib.newFixedFraction
-DA:111,13
-DA:112,13
-DA:113,13
+FNDA:37,FixidityLib.newFixedFraction
+DA:111,37
+DA:112,37
+DA:113,37
 FN:123,FixidityLib.integer
 FNDA:28,FixidityLib.integer
 DA:124,28
@@ -1262,15 +1820,15 @@ BRDA:227,16,0,-
 BRDA:227,16,1,-
 DA:228,0
 FN:244,FixidityLib.divide
-FNDA:26,FixidityLib.divide
-DA:245,26
+FNDA:50,FixidityLib.divide
+DA:245,50
 BRDA:245,17,0,-
-BRDA:245,17,1,26
-DA:246,26
-DA:247,26
+BRDA:245,17,1,50
+DA:246,50
+DA:247,50
 BRDA:247,18,0,-
-BRDA:247,18,1,26
-DA:248,26
+BRDA:247,18,1,50
+DA:248,50
 FN:254,FixidityLib.gt
 FNDA:0,FixidityLib.gt
 DA:255,0
@@ -1289,32 +1847,62 @@ DA:283,0
 FN:289,FixidityLib.isProperFraction
 FNDA:0,FixidityLib.isProperFraction
 DA:290,0
-FNF:22
-FNH:13
-LF:56
-LH:45
-BRF:27
-BRH:10
+FNF:44
+FNH:18
+LF:112
+LH:52
+BRF:54
+BRH:11
 end_of_record
 TN:
 SF:node_modules/@celo/contracts/common/Initializable.sol
 FN:7,Initializable.
-FNDA:30,Initializable.
-DA:8,30
+FNDA:6,Initializable.
+DA:8,6
 BRDA:8,0,0,-
 DA:9,0
 FN:13,Initializable.initializer
-FNDA:30,Initializable.initializer
-DA:14,30
+FNDA:6,Initializable.initializer
+DA:14,6
 BRDA:14,1,0,-
-BRDA:14,1,1,30
-DA:15,30
+BRDA:14,1,1,6
+DA:15,6
+FN:7,Initializable.
+FNDA:36,Initializable.
+DA:8,36
+BRDA:8,0,0,-
+DA:9,0
+FN:13,Initializable.initializer
+FNDA:36,Initializable.initializer
+DA:14,36
+BRDA:14,1,0,-
+BRDA:14,1,1,36
+DA:15,36
+FNF:4
+FNH:4
+LF:8
+LH:6
+BRF:6
+BRH:2
+end_of_record
+TN:
+SF:node_modules/@celo/contracts/common/libraries/ReentrancyGuard.sol
+FN:13,ReentrancyGuard.
+FNDA:6,ReentrancyGuard.
+DA:16,6
+FN:26,ReentrancyGuard.nonReentrant
+FNDA:0,ReentrancyGuard.nonReentrant
+DA:27,0
+DA:28,0
+DA:30,0
+BRDA:30,0,0,-
+BRDA:30,0,1,-
 FNF:2
-FNH:2
+FNH:1
 LF:4
-LH:3
-BRF:3
-BRH:1
+LH:1
+BRF:2
+BRH:0
 end_of_record
 TN:
 SF:test/unit/goodDollar/BancorExchangeProvider.t.sol