feat: upgrade mainnet state-lens/ics23/ics23 clients

Author: benluelo

deployments/deployments.json

@@ -259,7 +259,7 @@
         "state-lens/ics23/ics23": {
           "address": "0x2c5b55a11fad1d169b83df21d886ce0797f3a83d",
           "height": 22236429,
-          "commit": "2d6ccbaaf8dcb6d282e8e499584de937f9719066"
+          "commit": "c2c6c2c8e11910ccd5ca6bc3db1055364a21af8a"
         },
         "state-lens/ics23/smt": {
           "address": "0xd411236ab864284374ae95b23b747b97bfca9207",
@@ -421,7 +421,7 @@
         "state-lens/ics23/ics23": {
           "address": "0x2c5b55a11fad1d169b83df21d886ce0797f3a83d",
           "height": 15699439,
-          "commit": "2d6ccbaaf8dcb6d282e8e499584de937f9719066"
+          "commit": "c2c6c2c8e11910ccd5ca6bc3db1055364a21af8a"
         },
         "state-lens/ics23/smt": {
           "address": "0xd411236ab864284374ae95b23b747b97bfca9207",
@@ -529,7 +529,7 @@
         "state-lens/ics23/ics23": {
           "address": "0x2c5b55a11fad1d169b83df21d886ce0797f3a83d",
           "height": 392724,
-          "commit": "2d6ccbaaf8dcb6d282e8e499584de937f9719066"
+          "commit": "c2c6c2c8e11910ccd5ca6bc3db1055364a21af8a"
         },
         "state-lens/ics23/smt": {
           "address": "0xd411236ab864284374ae95b23b747b97bfca9207",

evm/contracts/clients/StateLensIcs23Ics23Client.sol

@@ -28,14 +28,6 @@ struct Header {
     bytes l2ConsensusState;
 }
 
-struct LegacyClientState {
-    string l2ChainId;
-    uint32 l1ClientId;
-    uint32 l2ClientId;
-    uint64 l2LatestHeight;
-    bytes32 contractAddress;
-}
-
 struct ClientState {
     string l2ChainId;
     uint32 l1ClientId;
@@ -133,7 +125,7 @@ contract StateLensIcs23Ics23Client is
 
     address public immutable IBC_HANDLER;
 
-    mapping(uint32 => LegacyClientState) private legacyClientStates;
+    uint256 private _deprecatedLegacyClientStates;
     mapping(uint32 => mapping(uint64 => ConsensusState)) private consensusStates;
 
     mapping(uint32 => ClientState) private clientStates;
@@ -153,30 +145,6 @@ contract StateLensIcs23Ics23Client is
         __Pausable_init();
     }
 
-    function migrateClientStateToV1(
-        uint32[] calldata clientIds
-    ) public restricted {
-        for (uint256 i = 0; i < clientIds.length; i++) {
-            LegacyClientState storage legacyState =
-                legacyClientStates[clientIds[i]];
-            ClientState storage newState = clientStates[clientIds[i]];
-
-            newState.l2ChainId = legacyState.l2ChainId;
-            newState.l1ClientId = legacyState.l1ClientId;
-            newState.l2ClientId = legacyState.l2ClientId;
-            newState.l2LatestHeight = legacyState.l2LatestHeight;
-            newState.version = uint256(1);
-            newState.state = ExtraV1({
-                storeKey: IBCStoreLib.WASMD_MODULE_STORE_KEY,
-                keyPrefixStorage: abi.encodePacked(
-                    IBCStoreLib.WASMD_CONTRACT_STORE_PREFIX,
-                    legacyState.contractAddress,
-                    IBCStoreLib.IBC_UNION_COSMWASM_COMMITMENT_PREFIX
-                )
-            }).encode();
-        }
-    }
-
     function createClient(
         address,
         uint32 clientId,

evm/scripts/Deploy.s.sol

@@ -1559,20 +1559,11 @@ contract UpgradeStateLensIcs23Ics23Client is VersionedScript {
     address immutable deployer;
     address immutable sender;
     uint256 immutable privateKey;
-    uint32[] public clientIds;
 
     constructor() {
         deployer = vm.envAddress("DEPLOYER");
         sender = vm.envAddress("SENDER");
         privateKey = vm.envUint("PRIVATE_KEY");
-
-        // uint256[] memory u256ClientIds = vm.envUint("CLIENT_IDS", ",");
-
-        // clientIds = new uint32[](u256ClientIds.length);
-
-        // for (uint256 i = 0; i < u256ClientIds.length; ++i) {
-        //     clientIds[i] = uint32(u256ClientIds[i]);
-        // }
     }
 
     function getDeployed(
@@ -1605,10 +1596,6 @@ contract UpgradeStateLensIcs23Ics23Client is VersionedScript {
         stateLensIcs23Ics23Client.upgradeToAndCall(
             newImplementation, new bytes(0)
         );
-        // abi.encodeWithSelector(
-        //     StateLensIcs23Ics23Client.migrateClientStateToV1.selector,
-        //     clientIds
-        // )
 
         vm.stopBroadcast();
     }

flake.nix

@@ -346,7 +346,21 @@
                           unset LD_LIBRARY_PATH
                           EOF
 
+                          echo "patched cast"
+
                           chmod +x $out/bin/cast
+
+                          mv $out/bin/forge $out/bin/forge-cursed
+
+                          cat <<EOF >> $out/bin/forge
+                          export LD_LIBRARY_PATH=${lib.makeLibraryPath [ super.stdenv.cc.cc.lib ]}
+                          $out/bin/forge-cursed "\$@"
+                          unset LD_LIBRARY_PATH
+                          EOF
+
+                          chmod +x $out/bin/forge
+
+                          echo "patched forge"
                         '';
                     });