Skip to content

Commit

Permalink
Revert "fix(protocol): add 1 to _REENTRY_SLOT in EssentialContract (#…
Browse files Browse the repository at this point in the history
…16593)"

This reverts commit a381ddd.
  • Loading branch information
Keszey Dániel authored and Keszey Dániel committed Apr 29, 2024
1 parent da46084 commit f297dd7
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions packages/protocol/contracts/common/EssentialContract.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ abstract contract EssentialContract is UUPSUpgradeable, Ownable2StepUpgradeable,

uint8 private constant _TRUE = 2;

/// @dev The slot in transient storage of the reentry lock.
/// This is the result of keccak256("ownerUUPS.reentry_slot") plus 1. The addition aims to
/// prevent hash collisions with slots defined in EIP-1967, where slots are derived by
/// keccak256("something") - 1, and with slots in SignalService, calculated directly with
/// keccak256("something").
/// @dev The slot in transient storage of the reentry lock. This is the keccak256 hash
/// of "ownerUUPS.reentry_slot"
bytes32 private constant _REENTRY_SLOT =
0xa5054f728453d3dbe953bdc43e4d0cb97e662ea32d7958190f3dc2da31d9721b;
0xa5054f728453d3dbe953bdc43e4d0cb97e662ea32d7958190f3dc2da31d9721a;

/// @dev Slot 1.
uint8 private __reentry;
Expand Down

0 comments on commit f297dd7

Please sign in to comment.