cometbls - upgrade protos & use untrusted validator hash from the sig…

…ned header (#781) fixes #780
unionlabs · Oct 9, 2023 · ae305f2 · ae305f2
2 parents 74f5281 + 1c1f117
commit ae305f2
Show file tree

Hide file tree

Showing 93 changed files with 21,779 additions and 13,229 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/evm/contracts/Glue.sol b/evm/contracts/Glue.sol
@@ -21,6 +21,9 @@ contract Glue {
         IbcCoreClientV1Height.Data memory,
         OptimizedConsensusState memory,
         ProcessedMoment memory,
-        TendermintTypesCanonicalVote.Data memory
+        TendermintTypesCanonicalVote.Data memory,
+        IbcLightclientsTendermintV1ClientState.Data memory,
+        IbcLightclientsTendermintV1ConsensusState.Data memory,
+        IbcLightclientsTendermintV1Header.Data memory
     ) public pure {}
 }
diff --git a/evm/contracts/clients/CometblsClient.sol b/evm/contracts/clients/CometblsClient.sol
@@ -191,7 +191,9 @@ contract CometblsClient is ILightClient {
             untrustedValidatorsHash = trustedValidatorsHash;
         } else {
             untrustedValidatorsHash = header
-                .untrusted_validator_set_root
+                .signed_header
+                .header
+                .validators_hash
                 .toBytes32(0);
         }
 

diff --git a/evm/contracts/proto/union/ibc/lightclients/cometbls/v1/cometbls.sol b/evm/contracts/proto/union/ibc/lightclients/cometbls/v1/cometbls.sol