🛞 Rename KDAOLocked address identifier: KDAOL -> KDAO_LOCKED

Author: KimlikDAO-bot

kimlikdao/IDIDSigners.sol

@@ -5,12 +5,36 @@ pragma solidity ^0.8.0;
 import {Signature} from "../types/Signature.sol";
 import {uint128x2} from "../types/uint128x2.sol";
 
+interface IDIDSigners {
+    function authenticateHumanIDv1(
+        bytes32 exposureReportID,
+        uint128x2 weightThresholdAndSignatureTs,
+        bytes32 commitmentR,
+        Signature[3] calldata sigs
+    ) external view;
+
+    function authenticateHumanIDv1(
+        bytes32 humanID,
+        uint128x2 weightThresholdAndSignatureTs,
+        bytes32 commitmentR,
+        Signature[5] calldata sigs
+    ) external view;
+
+    /**
+     * Maps a signer node address to a bit packed struct.
+     */
+    function signerInfo(address signer) external view returns (SignerInfo);
+}
+
+interface IDIDSignersExposureReport {
+    function reportExposure(bytes32 exposureReportID, uint256 signatureTs, Signature[3] calldata sigs) external;
+}
+
 uint256 constant SIGNER_INFO_END_TS_MASK = uint256(type(uint64).max) << 112;
 
 uint256 constant SIGNER_INFO_WITHDRAW_MASK = uint256(type(uint48).max) << 176;
 
 /**
- *
  * `signerInfo` layout:
  * |-- color --|-- withdraw --|--  endTs --|-- deposit --|-- startTs --|
  * |--   32  --|--    48    --|--   64   --|--   48    --|--   64    --|
@@ -73,28 +97,3 @@ using {
     hasEndTs,
     isZero
 } for SignerInfo global;
-
-interface IDIDSigners {
-    function authenticateHumanIDv1(
-        bytes32 exposureReportID,
-        uint128x2 weightThresholdAndSignatureTs,
-        bytes32 commitmentR,
-        Signature[3] calldata sigs
-    ) external view;
-
-    function authenticateHumanIDv1(
-        bytes32 humanID,
-        uint128x2 weightThresholdAndSignatureTs,
-        bytes32 commitmentR,
-        Signature[5] calldata sigs
-    ) external view;
-
-    /**
-     * Maps a signer node address to a bit packed struct.
-     */
-    function signerInfo(address signer) external view returns (SignerInfo);
-}
-
-interface IDIDSignersExposureReport {
-    function reportExposure(bytes32 exposureReportID, uint256 signatureTs, Signature[3] calldata sigs) external;
-}

kimlikdao/addresses.sol

@@ -28,29 +28,29 @@ address constant KPASS_ZKSYNC = 0xcCc053d81e3B85Eac133a5333be4D7cBDd120cCc;
 address constant KPASS_ZKSYNC_DEPLOYER = 0x1F7766565AaDD753379181678623273A82f8603c;
 
 // KDAO addresses
-address constant KDAO_MAINNET = 0xcCc0AC04C9251B74b0b30A20Fc7cb26EB62B0cCc;
-address constant KDAO_MAINNET_DEPLOYER = 0xe7671eb60A45c905387df2b19A3803c6Be0Eb8f9;
+address constant KDAO_ETHEREUM = 0xcCc0AC04C9251B74b0b30A20Fc7cb26EB62B0cCc;
+address constant KDAO_ETHEREUM_DEPLOYER = 0xe7671eb60A45c905387df2b19A3803c6Be0Eb8f9;
 address constant KDAO_ZKSYNC = 0xcCc0b95cE2e18223bA8059F2c9Fad9d914450cCc;
 address constant KDAO_ZKSYNC_DEPLOYER = 0x0410641e73f261b98EB7aB189F6b4e1052833c2A;
 address constant KDAO_ZKSYNC_ALIAS = 0xdDd1AC04c9251B74B0B30A20FC7cb26Eb62b1ddd;
 address constant KDAO_PRESALE = 0xcCc07b3e77516A13B6810112E8fA6D2895c31cCc;
 address constant KDAO_PRESALE_DEPLOYER = 0x006d0847bad678B2b5116E74C69Da301d7172cfA;
 
 // KDAO-l addresses
-address constant KDAOL = 0xcCc0948D9e47Ab3932271DA380B3525DD05a1cCc;
-address constant KDAOL_DEPLOYER = 0xb81bFa6348ACc1Dab88cc2b35d7eEce4A68aE2b2;
+address constant KDAO_LOCKED = 0xcCc0948D9e47Ab3932271DA380B3525DD05a1cCc;
+address constant KDAO_LOCKED_DEPLOYER = 0xb81bFa6348ACc1Dab88cc2b35d7eEce4A68aE2b2;
 
 //
 // Voting contract
 //
-address constant VOTING_MAINNET = 0xcCc01Ec0E6Fb38Cce8b313c3c8dbfe66efD01cCc;
-address constant VOTING_MAINNET_DEPLOYER = 0xD808C187Ef7D6f9999b6D9538C72E095db8c6df9;
+address constant VOTING_EVM = 0xcCc01Ec0E6Fb38Cce8b313c3c8dbfe66efD01cCc;
+address constant VOTING_EVM_DEPLOYER = 0xD808C187Ef7D6f9999b6D9538C72E095db8c6df9;
 address constant VOTING = 0xcCc0a523f5392AD629EfAA49E71844E61AB81cCc;
 address constant VOTING_DEPLOYER = 0x526F38A49130169412B00De254bDafbaAB4E7E91;
 
 // KPASS Signers
-address constant KPASS_SIGNERS_MAINNET = 0xcCc09aA0d174271259D093C598FCe9Feb2791cCc;
-address constant KPASS_SIGNERS_MAINNET_DEPLOYER = 0x4DeA92Bcb2C22011217C089797A270DfA5A51d53;
+address constant KPASS_SIGNERS_EVM = 0xcCc09aA0d174271259D093C598FCe9Feb2791cCc;
+address constant KPASS_SIGNERS_EVM_DEPLOYER = 0x4DeA92Bcb2C22011217C089797A270DfA5A51d53;
 address constant KPASS_SIGNERS = 0xcCc0b54E5538fa5B4E0EcE1f2B0ba9C01c8A1cCc;
 address constant KPASS_SIGNERS_DEPLOYER = 0x755DDeBf547DD2e9838d16b51525fe8e925a56D0;
 

test/kimlikdao/addresses.t.sol

@@ -4,10 +4,10 @@ pragma solidity ^0.8.0;
 
 import {Test} from "forge-std/Test.sol";
 import {
-    KDAOL,
-    KDAOL_DEPLOYER,
-    KDAO_MAINNET,
-    KDAO_MAINNET_DEPLOYER,
+    KDAO_ETHEREUM,
+    KDAO_ETHEREUM_DEPLOYER,
+    KDAO_LOCKED,
+    KDAO_LOCKED_DEPLOYER,
     KDAO_ZKSYNC,
     KDAO_ZKSYNC_ALIAS,
     KDAO_ZKSYNC_DEPLOYER,
@@ -30,13 +30,13 @@ contract addressesTest is Test {
         assertEq(vm.computeCreateAddress(KPASS_DEPLOYER, 0), KPASS);
         assertEq(computeZkSyncCreateAddress(KPASS_ZKSYNC_DEPLOYER, 0), KPASS_ZKSYNC);
 
-        assertEq(vm.computeCreateAddress(KDAO_MAINNET_DEPLOYER, 0), KDAO_MAINNET);
+        assertEq(vm.computeCreateAddress(KDAO_ETHEREUM_DEPLOYER, 0), KDAO_ETHEREUM);
         assertEq(computeZkSyncCreateAddress(KDAO_ZKSYNC_DEPLOYER, 0), KDAO_ZKSYNC);
 
-        assertEq(computeZkSyncCreateAddress(KDAOL_DEPLOYER, 0), KDAOL);
+        assertEq(computeZkSyncCreateAddress(KDAO_LOCKED_DEPLOYER, 0), KDAO_LOCKED);
     }
 
     function testAliasConsistency() public pure {
-        assertEq(applyL1ToL2Alias(KDAO_MAINNET), KDAO_ZKSYNC_ALIAS);
+        assertEq(applyL1ToL2Alias(KDAO_ETHEREUM), KDAO_ZKSYNC_ALIAS);
     }
 }

testing/MockProtocolFund.sol

@@ -13,9 +13,8 @@ contract MockProtocolFund {
 
     fallback() external payable {
         assembly {
-            let codeAddress := sload(CODE_SLOT)
             calldatacopy(0, 0, calldatasize())
-            let result := delegatecall(gas(), codeAddress, 0, calldatasize(), 0, 0)
+            let result := delegatecall(gas(), sload(CODE_SLOT), 0, calldatasize(), 0, 0)
             returndatacopy(0, 0, returndatasize())
             switch result
             case 0 { revert(0, returndatasize()) }