Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(evm): introduce EvmInCosmosClient state lens #3368

Merged
merged 11 commits into from
Dec 31, 2024
Merged

feat(evm): introduce EvmInCosmosClient state lens #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
25265b1
feat(evm): introduce `EvmInCosmosClient` state lens
hussein-aitlahcen Dec 11, 2024
f6c23c5
chore(evm): rearrange libraries
hussein-aitlahcen Dec 16, 2024
568e200
feat(voyager): evm state lens modules
hussein-aitlahcen Dec 27, 2024
e8f7440
fix(voyager): modules are now individually buildable
hussein-aitlahcen Dec 29, 2024
1052e42
feat(state-lens): include chain id and deployment script
hussein-aitlahcen Dec 29, 2024
da8b8e1
feat(voyager): state lens bootstrap and more
hussein-aitlahcen Dec 30, 2024
03ae6b5
fix(evm): invalid mpt verification in evm state lens
hussein-aitlahcen Dec 30, 2024
1270f10
feat(voyager): more state lenses
hussein-aitlahcen Dec 30, 2024
24abb83
chore: clippy & reenable missing packages
hussein-aitlahcen Dec 30, 2024
264e461
chore: update Cargo.lock
benluelo Dec 31, 2024
ef1fc1e
chore: cleanup
benluelo Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 88 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ members = [
"lib/tendermint-light-client-types",
"lib/linea-light-client-types",
"lib/movement-light-client-types",
"lib/state-lens/evm-light-client-types",

# these will all be re enabled and updated once ethereum-light-client is updated

Expand Down Expand Up @@ -114,11 +115,13 @@ members = [
"voyager/modules/client/ethereum",
"voyager/modules/client/movement",
"voyager/modules/client/tendermint",
"voyager/modules/client/state-lens/evm",

"voyager/modules/client-bootstrap/cometbls",
"voyager/modules/client-bootstrap/ethereum",
"voyager/modules/client-bootstrap/movement",
"voyager/modules/client-bootstrap/tendermint",
"voyager/modules/client-bootstrap/state-lens/evm",

"voyager/modules/consensus/berachain",
"voyager/modules/consensus/cometbls",
Expand All @@ -131,6 +134,7 @@ members = [
"voyager/plugins/client-update/ethereum",
"voyager/plugins/client-update/movement",
"voyager/plugins/client-update/tendermint",
"voyager/plugins/client-update/state-lens/evm",

"voyager/plugins/periodic-client-update",

Expand Down Expand Up @@ -208,6 +212,8 @@ scroll-api = { path = "lib/scroll-api", default-features = fal
scroll-codec = { path = "lib/scroll-codec", default-features = false }
scroll-rpc = { path = "lib/scroll-rpc", default-features = false }

evm-state-lens-light-client-types = { path = "lib/state-lens/evm-light-client-types", default-features = false }

tendermint-light-client = { path = "cosmwasm/union-ibc/light-clients/tendermint", default-features = false }
tendermint-light-client-types = { path = "lib/tendermint-light-client-types", default-features = false }
tendermint-verifier = { path = "lib/tendermint-verifier", default-features = false }
Expand Down
11 changes: 5 additions & 6 deletions evm/contracts/clients/CometblsClient.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ import "@openzeppelin-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import "@openzeppelin-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin-upgradeable/utils/PausableUpgradeable.sol";

import "./ICS23MembershipVerifier.sol";
import "./Verifier.sol";

import "../core/02-client/ILightClient.sol";
import "../core/24-host/IBCStore.sol";
import "../core/24-host/IBCCommitment.sol";
import "../lib/Common.sol";
import "../lib/ICS23.sol";
import "../lib/CometblsZKVerifier.sol";
import "../lib/ICS23Verifier.sol";

struct SignedHeader {
uint64 height;
Expand Down Expand Up @@ -392,7 +391,7 @@ contract CometblsClient is
}
bytes32 contractAddress = clientStates[clientId].contractAddress;
bytes32 appHash = consensusStates[clientId][height].appHash;
return ICS23MembershipVerifier.verifyMembership(
return ICS23Verifier.verifyMembership(
appHash,
proof,
abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
Expand All @@ -414,7 +413,7 @@ contract CometblsClient is
}
bytes32 contractAddress = clientStates[clientId].contractAddress;
bytes32 appHash = consensusStates[clientId][height].appHash;
return ICS23MembershipVerifier.verifyNonMembership(
return ICS23Verifier.verifyNonMembership(
appHash,
proof,
abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
Expand Down Expand Up @@ -540,7 +539,7 @@ contract CometblsClient is
commitmentHash
];

return Verifier.verifyProof(
return CometblsZKVerifier.verifyProof(
zkp.proof, zkp.proofCommitment, zkp.proofCommitmentPOK, publicInputs
);
}
Expand Down
7 changes: 3 additions & 4 deletions evm/contracts/clients/CosmosInCosmosClient.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import "../core/24-host/IBCStore.sol";
import "../core/24-host/IBCCommitment.sol";
import "../lib/ICS23.sol";
import "../lib/Common.sol";

import "./ICS23MembershipVerifier.sol";
import "../lib/ICS23Verifier.sol";

struct TendermintConsensusState {
uint64 timestamp;
Expand Down Expand Up @@ -216,7 +215,7 @@ contract CosmosInCosmosClient is
revert CosmosInCosmosLib.ErrClientFrozen();
}
bytes32 appHash = consensusStates[clientId][height].appHash;
return ICS23MembershipVerifier.verifyMembership(
return ICS23Verifier.verifyMembership(
appHash,
proof,
abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
Expand All @@ -235,7 +234,7 @@ contract CosmosInCosmosClient is
revert CosmosInCosmosLib.ErrClientFrozen();
}
bytes32 appHash = consensusStates[clientId][height].appHash;
return ICS23MembershipVerifier.verifyNonMembership(
return ICS23Verifier.verifyNonMembership(
appHash,
proof,
abi.encodePacked(IBCStoreLib.COMMITMENT_PREFIX),
Expand Down
Loading
Loading