@evvm/testnet-contracts 3.0.0 → 3.0.2

package/contracts/core/lib/CoreStorage.sol

@@ -61,23 +61,6 @@ abstract contract CoreStorage {
      */
     address treasuryAddress;
 
-    //░▒▓█ Token Whitelist Proposal State ██████████████████████████████████████████████▓▒░
-
-    /**
-     * @notice Pending token address to be whitelisted.
-     */
-    address whitelistTokenToBeAdded_address;
-
-    /**
-     * @notice Uniswap V3 (or similar) pool address used to verify liquidity for the pending token.
-     */
-    address whitelistTokenToBeAdded_pool;
-
-    /**
-     * @notice Timestamp when the pending token whitelist proposal can be accepted.
-     */
-    uint256 whitelistTokenToBeAdded_dateToSet;
-
     //░▒▓█ Proxy Implementation State ██████████████████████████████████████████████████▓▒░
 
     /**
@@ -96,6 +79,13 @@ abstract contract CoreStorage {
      */
     uint256 timeToAcceptImplementation;
 
+    //░▒▓█ Total supply ██████████████████████████████████████████████████▓▒░
+
+    /**
+     * @notice Timestamp after which the maximum supply can be deleted.
+     */
+    uint256 timeToDeleteMaxSupply;
+
     //░▒▓█ EVVM Configuration State ████████████████████████████████████████████████████▓▒░
 
     /**
@@ -103,6 +93,11 @@ abstract contract CoreStorage {
      */
     uint256 windowTimeToChangeEvvmID;
 
+    /**
+     * @notice Current total supply of the principal token within the EVVM.
+     */
+    uint256 currentSupply;
+
     /**
      * @notice Metadata configuration for this EVVM instance (ID, token info, rewards).
      * @dev Crucial for EIP-191 signature verification to prevent replay attacks.
@@ -116,6 +111,29 @@ abstract contract CoreStorage {
      */
     ProposalStructs.AddressTypeProposal admin;
 
+    //░▒▓█ Reward Distribution State ██████████████████████████████████████████████████████▓▒░
+
+    /**
+     * @notice This flag can be used to pause or resume the distribution of staking rewards
+     *         if the 99.99% of the maximum supply has been reached. If true the distribution of rewards
+     *         is active, if false the distribution of rewards is paused.
+     *
+     */
+    ProposalStructs.BoolTypeProposal rewardFlowDistribution;
+
+    uint256 proposalChangeReward;
+    uint256 timeToAcceptChangeReward;
+
+    //░▒▓█ List state ████████████████████████████████████████████████████████▓▒░
+
+    /**
+     * @notice Indicates if the EVVM nees to check the allowlist or the denylist for token operations.
+     * @dev 0x00 = no lists active
+     *      0x01 = allowlist active
+     *      0x02 = denylist active
+     */
+    ProposalStructs.Bytes1TypeProposal listStatus;
+
     //░▒▓█ Initialization State ████████████████████████████████████████████████████████▓▒░
 
     /**
@@ -138,13 +156,6 @@ abstract contract CoreStorage {
      */
     mapping(address user => mapping(address token => uint256 quantity)) balances;
 
-    //░▒▓█ Fisher Bridge State ██████████████████████████████████████████████████████████▓▒░
-
-    /**
-     * @notice Nonce tracking for ordered Fisher Bridge cross-chain deposits.
-     */
-    mapping(address user => uint256 nonce) nextFisherDepositNonce;
-
     //░▒▓█ Nonce State ██████████████████████████████████████████████████████████▓▒░
 
     /**
@@ -168,4 +179,29 @@ abstract contract CoreStorage {
      * @notice tracks the next expected nonce for sequential (synchronous) transactions.
      */
     mapping(address user => uint256 nonce) nextSyncNonce;
+
+    //░▒▓█ Token allowlist/denylist ██████████████████████████████████████████████████████████▓▒░
+
+    /**
+     * @notice Tracks what token addresses are denied for use in the EVVM
+     *         if a token is in the denylist, it cannot:
+     *         - be deposited to the EVVM
+     *         - be used for execution payments (transfers between accounts/services)
+     *         but it can:
+     *         - be withdrawn from the EVVM (users can get their tokens out, but not back in)
+     *         by default all the tokens are allowed until they are added to the
+     *         denyList, if the denyList is active (listStatus = 0x02)
+     */
+    mapping(address tokenAdress => bool isDenied) denyList;
+
+    /**
+     * @notice Tracks what token addresses are allowed for use in the EVVM
+     *         if a token is in the allowList, it can:
+     *         - be deposited to the EVVM
+     *         - be used for execution payments (transfers between accounts/services)
+     *         - can be withdrawn from the EVVM
+     *         by default all the tokens are denied until they are added to the
+     *         allowList, if the allowList is active (listStatus = 0x01)
+     */
+    mapping(address tokenAdress => bool isAllowed) allowList;
 }