chore: better constant and refactor lens creation event

Author: hussein-aitlahcen

cosmwasm/ibc-union/core/src/contract.rs

@@ -28,7 +28,7 @@ use ibc_union_spec::{
     path::{
         commit_packets, BatchPacketsPath, BatchReceiptsPath, ChannelPath, ClientStatePath,
         ConnectionPath, ConsensusStatePath, COMMITMENT_MAGIC, COMMITMENT_MAGIC_ACK,
-        COSMWASM_COMMITMENT_PREFIX,
+        IBC_UNION_COSMWASM_COMMITMENT_PREFIX,
     },
     types::{Channel, ChannelState, Connection, ConnectionState, Packet},
 };
@@ -1689,12 +1689,12 @@ fn merge_ack(mut ack: H256) -> H256 {
 }
 
 fn store_commit(deps: DepsMut, key: &H256, value: &H256) {
-    let canonical_path = [&COSMWASM_COMMITMENT_PREFIX, key.as_ref()].concat();
+    let canonical_path = [&IBC_UNION_COSMWASM_COMMITMENT_PREFIX, key.as_ref()].concat();
     deps.storage.set(&canonical_path, value.as_ref());
 }
 
 fn read_commit(deps: Deps, key: &H256) -> Option<H256> {
-    let canonical_path = [&COSMWASM_COMMITMENT_PREFIX, key.as_ref()].concat();
+    let canonical_path = [&IBC_UNION_COSMWASM_COMMITMENT_PREFIX, key.as_ref()].concat();
     deps.storage.get(&canonical_path).map(|bz| {
         bz.try_into()
             .expect("H256 is the only value ever written to this storage; qed;")

evm/contracts/clients/CometblsClient.sol

@@ -431,7 +431,7 @@ contract CometblsClient is
             abi.encodePacked(
                 IBCStoreLib.WASMD_CONTRACT_STORE_PREFIX,
                 contractAddress,
-                IBCStoreLib.COSMWASM_COMMITMENT_PREFIX,
+                IBCStoreLib.IBC_UNION_COSMWASM_COMMITMENT_PREFIX,
                 path
             ),
             value
@@ -456,7 +456,7 @@ contract CometblsClient is
             abi.encodePacked(
                 IBCStoreLib.WASMD_CONTRACT_STORE_PREFIX,
                 contractAddress,
-                IBCStoreLib.COSMWASM_COMMITMENT_PREFIX,
+                IBCStoreLib.IBC_UNION_COSMWASM_COMMITMENT_PREFIX,
                 path
             )
         );

evm/contracts/clients/StateLensIcs23Ics23Client.sol

@@ -47,10 +47,6 @@ library StateLensIcs23Ics23Lib {
     error ErrInvalidInitialConsensusState();
     error ErrInvalidMisbehaviour();
 
-    event CreateLensClient(
-        uint32 clientId, uint32 l1ClientId, uint32 l2ClientId, string l2ChainId
-    );
-
     function encode(
         ConsensusState memory consensusState
     ) internal pure returns (bytes memory) {
@@ -142,7 +138,7 @@ contract StateLensIcs23Ics23Client is
             height: block.number
         });
 
-        emit StateLensIcs23Ics23Lib.CreateLensClient(
+        emit CreateLensClient(
             clientId,
             clientState.l1ClientId,
             clientState.l2ClientId,
@@ -254,7 +250,7 @@ contract StateLensIcs23Ics23Client is
             abi.encodePacked(
                 IBCStoreLib.WASMD_CONTRACT_STORE_PREFIX,
                 contractAddress,
-                IBCStoreLib.COSMWASM_COMMITMENT_PREFIX,
+                IBCStoreLib.IBC_UNION_COSMWASM_COMMITMENT_PREFIX,
                 path
             ),
             value
@@ -279,7 +275,7 @@ contract StateLensIcs23Ics23Client is
             abi.encodePacked(
                 IBCStoreLib.WASMD_CONTRACT_STORE_PREFIX,
                 contractAddress,
-                IBCStoreLib.COSMWASM_COMMITMENT_PREFIX,
+                IBCStoreLib.IBC_UNION_COSMWASM_COMMITMENT_PREFIX,
                 path
             )
         );

evm/contracts/clients/StateLensIcs23MptClient.sol

@@ -36,12 +36,6 @@ struct ConsensusState {
 }
 
 library StateLensIcs23MptLib {
-    uint256 public constant EVM_IBC_COMMITMENT_SLOT = 0;
-
-    event CreateLensClient(
-        uint32 clientId, uint32 l1ClientId, uint32 l2ClientId, string l2ChainId
-    );
-
     error ErrNotIBC();
     error ErrTrustedConsensusStateNotFound();
     error ErrClientFrozen();
@@ -148,7 +142,7 @@ contract StateLensIcs23MptClient is
         clientStates[clientId] = clientState;
         consensusStates[clientId][clientState.l2LatestHeight] = consensusState;
 
-        emit StateLensIcs23MptLib.CreateLensClient(
+        emit CreateLensClient(
             clientId,
             clientState.l1ClientId,
             clientState.l2ClientId,
@@ -257,7 +251,7 @@ contract StateLensIcs23MptClient is
         }
         bytes32 storageRoot = consensusStates[clientId][height].storageRoot;
         bytes32 slot = keccak256(
-            abi.encodePacked(path, StateLensIcs23MptLib.EVM_IBC_COMMITMENT_SLOT)
+            abi.encodePacked(path, IBCStoreLib.IBC_UNION_EVM_COMMITMENT_SLOT)
         );
         (bool exists, bytes calldata provenValue) = MPTVerifier.verifyTrieValue(
             proof, keccak256(abi.encodePacked(slot)), storageRoot
@@ -278,7 +272,7 @@ contract StateLensIcs23MptClient is
         }
         bytes32 storageRoot = consensusStates[clientId][height].storageRoot;
         bytes32 slot = keccak256(
-            abi.encodePacked(path, StateLensIcs23MptLib.EVM_IBC_COMMITMENT_SLOT)
+            abi.encodePacked(path, IBCStoreLib.IBC_UNION_EVM_COMMITMENT_SLOT)
         );
         (bool exists,) = MPTVerifier.verifyTrieValue(
             proof, keccak256(abi.encodePacked(slot)), storageRoot

evm/contracts/clients/StateLensIcs23SmtClient.sol

@@ -33,12 +33,6 @@ struct ConsensusState {
 }
 
 library StateLensIcs23SmtLib {
-    uint256 public constant EVM_IBC_COMMITMENT_SLOT = 0;
-
-    event CreateLensClient(
-        uint32 clientId, uint32 l1ClientId, uint32 l2ClientId, string l2ChainId
-    );
-
     error ErrNotIBC();
     error ErrTrustedConsensusStateNotFound();
     error ErrClientFrozen();
@@ -152,7 +146,7 @@ contract StateLensIcs23SmtClient is
         clientStates[clientId] = clientState;
         consensusStates[clientId][clientState.l2LatestHeight] = consensusState;
 
-        emit StateLensIcs23SmtLib.CreateLensClient(
+        emit CreateLensClient(
             clientId,
             clientState.l1ClientId,
             clientState.l2ClientId,

evm/contracts/core/02-client/IBCClient.sol

@@ -9,7 +9,9 @@ import "../02-client/IIBCClient.sol";
 library IBCClientLib {
     event RegisterClient(string indexed clientType, address clientAddress);
     event CreateClient(
-        string indexed clientType, uint32 indexed clientId, string counterpartyChainId
+        string indexed clientType,
+        uint32 indexed clientId,
+        string counterpartyChainId
     );
     event UpdateClient(uint32 indexed clientId, uint64 height);
     event Misbehaviour(uint32 indexed clientId);

evm/contracts/core/02-client/ILightClient.sol

@@ -8,6 +8,13 @@ struct ConsensusStateUpdate {
     uint64 height;
 }
 
+event CreateLensClient(
+    uint32 indexed clientId,
+    uint32 indexed l1ClientId,
+    uint32 indexed l2ClientId,
+    string l2ChainId
+);
+
 /**
  * @dev This defines an interface for Light Client contract can be integrated with ibc-solidity.
  * You can register the Light Client contract that implements this through `registerClient` on IBCHandler.

evm/contracts/core/24-host/IBCStore.sol

@@ -7,7 +7,9 @@ import "../Types.sol";
 library IBCStoreLib {
     bytes public constant WASMD_MODULE_STORE_KEY = bytes("wasm");
     bytes1 public constant WASMD_CONTRACT_STORE_PREFIX = 0x03;
-    bytes1 public constant COSMWASM_COMMITMENT_PREFIX = 0x00;
+    bytes1 public constant IBC_UNION_COSMWASM_COMMITMENT_PREFIX = 0x00;
+
+    uint256 public constant IBC_UNION_EVM_COMMITMENT_SLOT = 0;
 }
 
 abstract contract IBCStore {

lib/ibc-union-spec/src/path.rs

@@ -9,7 +9,7 @@ use voyager_core::IbcStorePathKey;
 use super::IbcUnion;
 use crate::types::{Channel, ChannelId, ClientId, Connection, ConnectionId, Packet};
 
-pub const COSMWASM_COMMITMENT_PREFIX: [u8; 1] = [0x00];
+pub const IBC_UNION_COSMWASM_COMMITMENT_PREFIX: [u8; 1] = [0x00];
 
 /// 0x0100000000000000000000000000000000000000000000000000000000000000
 pub const COMMITMENT_MAGIC: H256 = {