Skip to content

Commit d28ba8f

Browse files
obatirouobatirou
authored
chore(host-contracts): use UPPER_SNAKE_CASE for private constants (#2337)
* chore(host-contracts): use UPPER_SNAKE_CASE for private constants Closes zama-ai/fhevm-internal#1207 * chore(host-contracts): alias ACL import so constant can be named ACL
1 parent 9af2665 commit d28ba8f

7 files changed

Lines changed: 105 additions & 105 deletions

File tree

‎host-contracts/contracts/ACL.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ contract ACL is
156156
uint256 private constant PATCH_VERSION = 0;
157157

158158
/// @notice FHEVMExecutor address.
159-
address private constant fhevmExecutorAddress = fhevmExecutorAdd;
159+
address private constant FHEVM_EXECUTOR_ADDRESS = fhevmExecutorAdd;
160160

161161
/// @notice PauserSet contract.
162162
IPauserSet private constant PAUSER_SET = IPauserSet(pauserSetAdd);
@@ -174,7 +174,7 @@ contract ACL is
174174
uint64 private constant REINITIALIZER_VERSION = 5;
175175

176176
/// keccak256(abi.encode(uint256(keccak256("fhevm.storage.ACL")) - 1)) & ~bytes32(uint256(0xff))
177-
bytes32 private constant ACLStorageLocation = 0xa688f31953c2015baaf8c0a488ee1ee22eb0e05273cc1fd31ea4cbee42febc00;
177+
bytes32 private constant ACL_STORAGE_LOCATION = 0xa688f31953c2015baaf8c0a488ee1ee22eb0e05273cc1fd31ea4cbee42febc00;
178178

179179
/// @custom:oz-upgrades-unsafe-allow constructor
180180
constructor() {
@@ -251,7 +251,7 @@ contract ACL is
251251
* @param account Address of the account.
252252
*/
253253
function allowTransient(bytes32 handle, address account) public virtual whenNotPaused {
254-
if (msg.sender != fhevmExecutorAddress) {
254+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) {
255255
if (isAccountDenied(msg.sender)) {
256256
revert SenderDenied(msg.sender);
257257
}
@@ -427,10 +427,10 @@ contract ACL is
427427

428428
/**
429429
* @notice Getter function for the FHEVMExecutor contract address.
430-
* @return fhevmExecutorAddress Address of the FHEVMExecutor.
430+
* @return FHEVM_EXECUTOR_ADDRESS Address of the FHEVMExecutor.
431431
*/
432432
function getFHEVMExecutorAddress() public view virtual returns (address) {
433-
return fhevmExecutorAddress;
433+
return FHEVM_EXECUTOR_ADDRESS;
434434
}
435435

436436
/**
@@ -605,7 +605,7 @@ contract ACL is
605605
*/
606606
function _getACLStorage() internal pure returns (ACLStorage storage $) {
607607
assembly {
608-
$.slot := ACLStorageLocation
608+
$.slot := ACL_STORAGE_LOCATION
609609
}
610610
}
611611
}

‎host-contracts/contracts/FHEVMExecutor.sol‎

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

‎host-contracts/contracts/HCULimit.sol‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
8383
uint256 private constant PATCH_VERSION = 0;
8484

8585
/// @notice FHEVMExecutor address.
86-
address private constant fhevmExecutorAddress = fhevmExecutorAdd;
86+
address private constant FHEVM_EXECUTOR_ADDRESS = fhevmExecutorAdd;
8787

8888
/// @custom:storage-location erc7201:fhevm.storage.HCULimit
8989
/// @dev All five uint48 fields pack into a single 256-bit slot (5 × 48 = 240 bits).
@@ -107,12 +107,12 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
107107
uint64 private constant REINITIALIZER_VERSION = 3;
108108

109109
/// keccak256(abi.encode(uint256(keccak256("fhevm.storage.HCULimit")) - 1)) & ~bytes32(uint256(0xff))
110-
bytes32 private constant HCULimitStorageLocation =
110+
bytes32 private constant HCU_LIMIT_STORAGE_LOCATION =
111111
0xc13af6c514bff8997f30c90003baa82bd02aad978179d1ce58d85c4319ad6500;
112112

113113
function _getHCULimitStorage() internal pure virtual returns (HCULimitStorage storage $) {
114114
assembly {
115-
$.slot := HCULimitStorageLocation
115+
$.slot := HCU_LIMIT_STORAGE_LOCATION
116116
}
117117
}
118118

@@ -173,7 +173,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
173173
bytes32 result,
174174
address caller
175175
) external virtual {
176-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
176+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
177177
uint256 opHCU;
178178
if (scalarByte == 0x01) {
179179
if (resultType == FheType.Uint8) {
@@ -227,7 +227,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
227227
bytes32 result,
228228
address caller
229229
) external virtual {
230-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
230+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
231231
uint256 opHCU;
232232
if (scalarByte == 0x01) {
233233
if (resultType == FheType.Uint8) {
@@ -281,7 +281,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
281281
bytes32 result,
282282
address caller
283283
) external virtual {
284-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
284+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
285285
uint256 opHCU;
286286
if (scalarByte == 0x01) {
287287
if (resultType == FheType.Uint8) {
@@ -334,7 +334,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
334334
bytes32 result,
335335
address caller
336336
) external virtual {
337-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
337+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
338338
uint256 opHCU;
339339
if (scalarByte != 0x01) revert OnlyScalarOperationsAreSupported();
340340
if (resultType == FheType.Uint8) {
@@ -370,7 +370,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
370370
bytes32 result,
371371
address caller
372372
) external virtual {
373-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
373+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
374374
uint256 opHCU;
375375
if (scalarByte != 0x01) revert OnlyScalarOperationsAreSupported();
376376
if (resultType == FheType.Uint8) {
@@ -407,7 +407,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
407407
bytes32 result,
408408
address caller
409409
) external virtual {
410-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
410+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
411411
uint256 opHCU;
412412
if (scalarByte == 0x01) {
413413
if (resultType == FheType.Bool) {
@@ -469,7 +469,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
469469
bytes32 result,
470470
address caller
471471
) external virtual {
472-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
472+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
473473
uint256 opHCU;
474474
if (scalarByte == 0x01) {
475475
if (resultType == FheType.Bool) {
@@ -531,7 +531,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
531531
bytes32 result,
532532
address caller
533533
) external virtual {
534-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
534+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
535535
uint256 opHCU;
536536
if (scalarByte == 0x01) {
537537
if (resultType == FheType.Bool) {
@@ -593,7 +593,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
593593
bytes32 result,
594594
address caller
595595
) external virtual {
596-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
596+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
597597
uint256 opHCU;
598598
if (scalarByte == 0x01) {
599599
if (resultType == FheType.Uint8) {
@@ -651,7 +651,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
651651
bytes32 result,
652652
address caller
653653
) external virtual {
654-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
654+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
655655
uint256 opHCU;
656656
if (scalarByte == 0x01) {
657657
if (resultType == FheType.Uint8) {
@@ -709,7 +709,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
709709
bytes32 result,
710710
address caller
711711
) external virtual {
712-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
712+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
713713
uint256 opHCU;
714714
if (scalarByte == 0x01) {
715715
if (resultType == FheType.Uint8) {
@@ -767,7 +767,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
767767
bytes32 result,
768768
address caller
769769
) external virtual {
770-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
770+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
771771
uint256 opHCU;
772772
if (scalarByte == 0x01) {
773773
if (resultType == FheType.Uint8) {
@@ -825,7 +825,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
825825
bytes32 result,
826826
address caller
827827
) external virtual {
828-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
828+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
829829
uint256 opHCU;
830830
if (scalarByte == 0x01) {
831831
if (resultType == FheType.Bool) {
@@ -891,7 +891,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
891891
bytes32 result,
892892
address caller
893893
) external virtual {
894-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
894+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
895895
uint256 opHCU;
896896
if (scalarByte == 0x01) {
897897
if (resultType == FheType.Bool) {
@@ -957,7 +957,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
957957
bytes32 result,
958958
address caller
959959
) external virtual {
960-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
960+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
961961
uint256 opHCU;
962962
if (scalarByte == 0x01) {
963963
if (resultType == FheType.Uint8) {
@@ -1011,7 +1011,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
10111011
bytes32 result,
10121012
address caller
10131013
) external virtual {
1014-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1014+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
10151015
uint256 opHCU;
10161016
if (scalarByte == 0x01) {
10171017
if (resultType == FheType.Uint8) {
@@ -1065,7 +1065,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
10651065
bytes32 result,
10661066
address caller
10671067
) external virtual {
1068-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1068+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
10691069
uint256 opHCU;
10701070
if (scalarByte == 0x01) {
10711071
if (resultType == FheType.Uint8) {
@@ -1119,7 +1119,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
11191119
bytes32 result,
11201120
address caller
11211121
) external virtual {
1122-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1122+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
11231123
uint256 opHCU;
11241124
if (scalarByte == 0x01) {
11251125
if (resultType == FheType.Uint8) {
@@ -1173,7 +1173,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
11731173
bytes32 result,
11741174
address caller
11751175
) external virtual {
1176-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1176+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
11771177
uint256 opHCU;
11781178
if (scalarByte == 0x01) {
11791179
if (resultType == FheType.Uint8) {
@@ -1227,7 +1227,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
12271227
bytes32 result,
12281228
address caller
12291229
) external virtual {
1230-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1230+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
12311231
uint256 opHCU;
12321232
if (scalarByte == 0x01) {
12331233
if (resultType == FheType.Uint8) {
@@ -1271,7 +1271,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
12711271
* @param caller Original caller address from FHEVMExecutor.
12721272
*/
12731273
function checkHCUForFheNeg(FheType resultType, bytes32 ct, bytes32 result, address caller) external virtual {
1274-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1274+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
12751275
uint256 opHCU;
12761276
if (resultType == FheType.Uint8) {
12771277
opHCU = 79000;
@@ -1298,7 +1298,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
12981298
* @param caller Original caller address from FHEVMExecutor.
12991299
*/
13001300
function checkHCUForFheNot(FheType resultType, bytes32 ct, bytes32 result, address caller) external virtual {
1301-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1301+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
13021302
uint256 opHCU;
13031303
if (resultType == FheType.Bool) {
13041304
opHCU = 2;
@@ -1327,7 +1327,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
13271327
* @param caller Original caller address from FHEVMExecutor.
13281328
*/
13291329
function checkHCUForCast(FheType resultType, bytes32 ct, bytes32 result, address caller) external virtual {
1330-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1330+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
13311331
uint256 opHCU;
13321332
if (resultType == FheType.Bool) {
13331333
opHCU = 32;
@@ -1356,7 +1356,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
13561356
* @param caller Original dapp caller address from FHEVMExecutor.
13571357
*/
13581358
function checkHCUForTrivialEncrypt(FheType resultType, bytes32 result, address caller) external virtual {
1359-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1359+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
13601360
uint256 opHCU;
13611361
if (resultType == FheType.Bool) {
13621362
opHCU = 32;
@@ -1397,7 +1397,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
13971397
bytes32 result,
13981398
address caller
13991399
) external virtual {
1400-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1400+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
14011401
uint256 opHCU;
14021402
if (resultType == FheType.Bool) {
14031403
opHCU = 55000;
@@ -1428,7 +1428,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
14281428
* @param caller Original dapp caller address from FHEVMExecutor.
14291429
*/
14301430
function checkHCUForFheRand(FheType resultType, bytes32 result, address caller) external virtual {
1431-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1431+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
14321432
uint256 opHCU;
14331433
if (resultType == FheType.Bool) {
14341434
opHCU = 19000;
@@ -1458,7 +1458,7 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
14581458
* @param caller Original dapp caller address from FHEVMExecutor.
14591459
*/
14601460
function checkHCUForFheRandBounded(FheType resultType, bytes32 result, address caller) external virtual {
1461-
if (msg.sender != fhevmExecutorAddress) revert CallerMustBeFHEVMExecutorContract();
1461+
if (msg.sender != FHEVM_EXECUTOR_ADDRESS) revert CallerMustBeFHEVMExecutorContract();
14621462
uint256 opHCU;
14631463
if (resultType == FheType.Uint8) {
14641464
opHCU = 23000;
@@ -1728,10 +1728,10 @@ contract HCULimit is UUPSUpgradeableEmptyProxy, ACLOwnable {
17281728

17291729
/**
17301730
* @notice Getter function for the FHEVMExecutor contract address.
1731-
* @return fhevmExecutorAddress Address of the FHEVMExecutor.
1731+
* @return FHEVM_EXECUTOR_ADDRESS Address of the FHEVMExecutor.
17321732
*/
17331733
function getFHEVMExecutorAddress() public view virtual returns (address) {
1734-
return fhevmExecutorAddress;
1734+
return FHEVM_EXECUTOR_ADDRESS;
17351735
}
17361736

17371737
/**

‎host-contracts/contracts/InputVerifier.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ contract InputVerifier is UUPSUpgradeableEmptyProxy, EIP712UpgradeableCrossChain
127127
uint64 private constant REINITIALIZER_VERSION = 3;
128128

129129
/// keccak256(abi.encode(uint256(keccak256("fhevm.storage.InputVerifier")) - 1)) & ~bytes32(uint256(0xff))
130-
bytes32 private constant InputVerifierStorageLocation =
130+
bytes32 private constant INPUT_VERIFIER_STORAGE_LOCATION =
131131
0x3f7d7a96c8c7024e92d37afccfc9b87773a33b9bc22e23134b683e74a50ace00;
132132

133133
/// @custom:oz-upgrades-unsafe-allow constructor
@@ -547,7 +547,7 @@ contract InputVerifier is UUPSUpgradeableEmptyProxy, EIP712UpgradeableCrossChain
547547
*/
548548
function _getInputVerifierStorage() internal pure returns (InputVerifierStorage storage $) {
549549
assembly {
550-
$.slot := InputVerifierStorageLocation
550+
$.slot := INPUT_VERIFIER_STORAGE_LOCATION
551551
}
552552
}
553553

‎host-contracts/contracts/KMSVerifier.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ contract KMSVerifier is UUPSUpgradeableEmptyProxy, EIP712UpgradeableCrossChain,
139139
uint64 private constant REINITIALIZER_VERSION = 3;
140140

141141
/// keccak256(abi.encode(uint256(keccak256("fhevm.storage.KMSVerifier")) - 1)) & ~bytes32(uint256(0xff))
142-
bytes32 private constant KMSVerifierStorageLocation =
142+
bytes32 private constant KMS_VERIFIER_STORAGE_LOCATION =
143143
0x7e81a744be86773af8644dd7304fa1dc9350ccabf16cfcaa614ddb78b4ce8900;
144144

145145
/// @custom:oz-upgrades-unsafe-allow constructor
@@ -577,7 +577,7 @@ contract KMSVerifier is UUPSUpgradeableEmptyProxy, EIP712UpgradeableCrossChain,
577577
*/
578578
function _getKMSVerifierStorage() internal pure returns (KMSVerifierStorage storage $) {
579579
assembly {
580-
$.slot := KMSVerifierStorageLocation
580+
$.slot := KMS_VERIFIER_STORAGE_LOCATION
581581
}
582582
}
583583

‎host-contracts/contracts/shared/EIP712UpgradeableCrossChain.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ abstract contract EIP712UpgradeableCrossChain is Initializable, IERC5267 {
5050
}
5151

5252
/// keccak256(abi.encode(uint256(keccak256("fhevm.storage.EIP712UpgradeableCrossChain")) - 1)) & ~bytes32(uint256(0xff))
53-
bytes32 private constant EIP712UpgradeableCrossChainLocation =
53+
bytes32 private constant EIP712_UPGRADEABLE_CROSS_CHAIN_LOCATION =
5454
0xe910845fd818f61127c84f3586776436a37dead33625056c65162537e3373600;
5555

5656
function _getEIP712Storage() private pure returns (EIP712Storage storage $) {
5757
assembly {
58-
$.slot := EIP712UpgradeableCrossChainLocation
58+
$.slot := EIP712_UPGRADEABLE_CROSS_CHAIN_LOCATION
5959
}
6060
}
6161

‎host-contracts/lib/Impl.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,15 +408,15 @@ interface IInputVerifier {
408408
*/
409409
library Impl {
410410
/// keccak256(abi.encode(uint256(keccak256("confidential.storage.config")) - 1)) & ~bytes32(uint256(0xff))
411-
bytes32 private constant CoprocessorConfigLocation =
411+
bytes32 private constant COPROCESSOR_CONFIG_LOCATION =
412412
0x9e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e4649700;
413413

414414
/**
415415
* @dev Returns the Coprocessor config.
416416
*/
417417
function getCoprocessorConfig() internal pure returns (CoprocessorConfig storage $) {
418418
assembly {
419-
$.slot := CoprocessorConfigLocation
419+
$.slot := COPROCESSOR_CONFIG_LOCATION
420420
}
421421
}
422422

0 commit comments

Comments
 (0)