Transfer unit tests for new token implementation (#2310)

* remove nonreentrant modifiers from the toke code as they are not needed

* add setup for all account types

* check all relevant contract initial states

* add test between any possible contract accounts

* prettier

* add some documentation and prettier

contracts/contracts/mocks/TestUpgradedOUSD.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import "../token/OUSD.sol";
+
+// used to alter internal state of OUSD contract
+contract TestUpgradedOUSD is OUSD {
+    constructor() OUSD() {}
+
+    function overwriteCreditBalances(address _account, uint256 _creditBalance)
+        public
+    {
+        _creditBalances[_account] = _creditBalance;
+    }
+
+    function overwriteAlternativeCPT(address _account, uint256 _acpt) public {
+        alternativeCreditsPerToken[_account] = _acpt;
+    }
+
+    function overwriteRebaseState(address _account, RebaseOptions _rebaseOption)
+        public
+    {
+        rebaseState[_account] = _rebaseOption;
+    }
+}

contracts/contracts/token/OUSD.sol

@@ -48,7 +48,7 @@ contract OUSD is Governable {
     uint256 public _totalSupply;
     mapping(address => mapping(address => uint256)) private _allowances;
     address public vaultAddress = address(0);
-    mapping(address => uint256) private _creditBalances;
+    mapping(address => uint256) internal _creditBalances;
     uint256 private _rebasingCredits; // Sum of all rebasing credits (_creditBalances for rebasing accounts)
     uint256 private _rebasingCreditsPerToken;
     uint256 public nonRebasingSupply; // All nonrebasing balances
@@ -538,7 +538,7 @@ contract OUSD is Governable {
         // prettier-ignore
         require(
             state == RebaseOptions.StdNonRebasing ||
-            state == RebaseOptions.NotSet,
+                state == RebaseOptions.NotSet,
             "Only standard non-rebasing accounts can opt in"
         );
 

contracts/deploy/deployActions.js

@@ -6,6 +6,7 @@ const {
   getOracleAddresses,
   isMainnet,
   isHolesky,
+  isTest,
 } = require("../test/helpers.js");
 const { deployWithConfirmation, withConfirmation } = require("../utils/deploy");
 const {
@@ -1190,7 +1191,12 @@ const deployOUSDCore = async () => {
   await deployWithConfirmation("VaultProxy");
 
   // Main contracts
-  const dOUSD = await deployWithConfirmation("OUSD");
+  let dOUSD;
+  if (isTest) {
+    dOUSD = await deployWithConfirmation("TestUpgradedOUSD");
+  } else {
+    dOUSD = await deployWithConfirmation("OUSD");
+  }
   const dVault = await deployWithConfirmation("Vault");
   const dVaultCore = await deployWithConfirmation("VaultCore");
   const dVaultAdmin = await deployWithConfirmation("VaultAdmin");