Skip to content

Commit

Permalink
More bincode and move lc types under lib (#3342)
Browse files Browse the repository at this point in the history
  • Loading branch information
@benluelo
benluelo authored Dec 4, 2024
2 parents b51adb1 + af1dd32 commit f963701
Show file tree
Hide file tree
Showing 68 changed files with 677 additions and 914 deletions.
49 changes: 47 additions & 2 deletions Cargo.lock
View file

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

44 changes: 22 additions & 22 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,30 +68,33 @@ members = [
"lib/scroll-verifier",
"lib/tendermint-verifier",

# these will all be re enabled and updated once ethereum-light-client is updated
"lib/ethereum-light-client-types",
"lib/arbitrum-light-client-types",
"lib/berachain-light-client-types",
"lib/cometbls-light-client-types",
"lib/scroll-light-client-types",
"lib/tendermint-light-client-types",
"lib/linea-light-client-types",
"lib/movement-light-client-types",

# "cosmwasm/union-ibc/light-clients/arbitrum",
"cosmwasm/union-ibc/light-clients/arbitrum/types",
# these will all be re enabled and updated once ethereum-light-client is updated

"cosmwasm/union-ibc/light-clients/ethereum",
"cosmwasm/union-ibc/light-clients/arbitrum",
# "cosmwasm/union-ibc/light-clients/berachain",
"cosmwasm/union-ibc/light-clients/berachain/types",

# "cosmwasm/union-ibc/light-clients/cometbls",
"cosmwasm/union-ibc/light-clients/cometbls/types",
"cosmwasm/union-ibc/light-clients/cometbls",

"cosmwasm/union-ibc/light-clients/ethereum",
"cosmwasm/union-ibc/light-clients/ethereum/types",

# "cosmwasm/union-ibc/light-clients/evm-in-cosmos",

# "cosmwasm/union-ibc/light-clients/scroll",
"cosmwasm/union-ibc/light-clients/scroll/types",

# "cosmwasm/union-ibc/light-clients/tendermint",
"cosmwasm/union-ibc/light-clients/tendermint/types",

# "cosmwasm/union-ibc/light-clients/linea",
"cosmwasm/union-ibc/light-clients/linea/types",

# "cosmwasm/union-ibc/light-clients/movement",

"tools/devnet-utils",
"tools/parse-wasm-client-type",
Expand Down Expand Up @@ -141,9 +144,6 @@ members = [

"drip",

# "cosmwasm/union-ibc/light-clients/movement",
"cosmwasm/union-ibc/light-clients/movement/types",

# "lib/aptos-verifier",

"lib/reconnecting-jsonrpc-ws-client",
Expand Down Expand Up @@ -184,31 +184,31 @@ chain-utils = { path = "lib/chain-utils", default-features = false }
cometbft-rpc = { path = "lib/cometbft-rpc", default-features = false }
cometbft-types = { path = "lib/cometbft-types", default-features = false }

arbitrum-light-client-types = { path = "cosmwasm/union-ibc/light-clients/arbitrum/types", default-features = false }
arbitrum-light-client-types = { path = "lib/arbitrum-light-client-types", default-features = false }
arbitrum-verifier = { path = "lib/arbitrum-verifier", default-features = false }

cometbls-groth16-verifier = { path = "lib/cometbls-groth16-verifier", default-features = false }
cometbls-light-client-types = { path = "cosmwasm/union-ibc/light-clients/cometbls/types", default-features = false }
cometbls-light-client-types = { path = "lib/cometbls-light-client-types", default-features = false }

scroll-light-client-types = { path = "cosmwasm/union-ibc/light-clients/scroll/types", default-features = false }
scroll-light-client-types = { path = "lib/scroll-light-client-types", default-features = false }
scroll-verifier = { path = "lib/scroll-verifier", default-features = false }

ethereum-light-client = { path = "cosmwasm/union-ibc/light-clients/ethereum", default-features = false }
ethereum-light-client-types = { path = "cosmwasm/union-ibc/light-clients/ethereum/types", default-features = false }
ethereum-light-client-types = { path = "lib/ethereum-light-client-types", default-features = false }
ethereum-sync-protocol = { path = "lib/ethereum-sync-protocol", default-features = false }
evm-storage-verifier = { path = "lib/evm-storage-verifier", default-features = false }

scroll-api = { path = "lib/scroll-api", default-features = false }
scroll-codec = { path = "lib/scroll-codec", default-features = false }
scroll-rpc = { path = "lib/scroll-rpc", default-features = false }

berachain-light-client-types = { path = "cosmwasm/union-ibc/light-clients/berachain/types", default-features = false }
berachain-light-client-types = { path = "lib/berachain-light-client-types", default-features = false }

tendermint-light-client = { path = "light-clients/tendermint-light-client", default-features = false }
tendermint-light-client-types = { path = "cosmwasm/union-ibc/light-clients/tendermint/types", 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 }

linea-light-client-types = { path = "cosmwasm/union-ibc/light-clients/linea/types", default-features = false }
linea-light-client-types = { path = "lib/linea-light-client-types", default-features = false }
linea-verifier = { path = "lib/linea-verifier", default-features = false }
linea-zktrie = { path = "lib/linea-zktrie", default-features = false }

Expand All @@ -231,7 +231,7 @@ poseidon-rs = { path = "lib/poseidon-rs", default-features =
protos = { path = "generated/rust/protos", default-features = false }
reconnecting-jsonrpc-ws-client = { path = "lib/reconnecting-jsonrpc-ws-client", default-features = false }

movement-light-client-types = { path = "cosmwasm/union-ibc/light-clients/movement/types", default-features = false }
movement-light-client-types = { path = "lib/movement-light-client-types", default-features = false }

cosmos-sdk-event = { path = "lib/cosmos-sdk-event", default-features = false }

Expand Down
5 changes: 2 additions & 3 deletions cosmwasm/union-ibc/light-clients/arbitrum/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ workspace = true
crate-type = ["cdylib", "rlib"]

[dependencies]
arbitrum-light-client-types = { workspace = true, features = ["proto"] }
arbitrum-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
arbitrum-verifier = { workspace = true }
cosmwasm-std = { version = "2.1.4", features = ["abort"] }
cosmwasm-std = { version = "2.1.4", features = ["abort", "cosmwasm_2_1"] }
ethereum-light-client = { workspace = true, features = ["library"] }
ethereum-light-client-types = { workspace = true }
evm-storage-verifier = { workspace = true }
Expand All @@ -24,7 +24,6 @@ protos = { workspace = true }
rlp = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde-json-wasm = { workspace = true }
sha3 = { workspace = true }
thiserror = { workspace = true }
tiny-keccak = { workspace = true, features = ["keccak"] }
Expand Down
4 changes: 2 additions & 2 deletions cosmwasm/union-ibc/light-clients/arbitrum/src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ethereum_light_client::client::EthereumLightClient;
use ethereum_light_client_types::StorageProof;
use union_ibc_light_client::{IbcClient, IbcClientCtx, IbcClientError};
use union_ibc_msg::lightclient::Status;
use unionlabs::encoding::Proto;
use unionlabs::encoding::Bincode;

use crate::errors::Error;

Expand All @@ -25,7 +25,7 @@ impl IbcClient for ArbitrumLightClient {

type StorageProof = StorageProof;

type Encoding = Proto;
type Encoding = Bincode;

fn verify_membership(
ctx: IbcClientCtx<Self>,
Expand Down
117 changes: 0 additions & 117 deletions cosmwasm/union-ibc/light-clients/arbitrum/types/src/client_state.rs
View file

This file was deleted.

31 changes: 13 additions & 18 deletions cosmwasm/union-ibc/light-clients/berachain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,24 @@ test-include = []
crate-type = ["cdylib", "rlib"]

[dependencies]
bytes = { workspace = true }
cosmwasm-std = { workspace = true, features = ["abort", "iterator"] }
# ethereum-light-client = { workspace = true, features = ["mainnet", "library"] }
beacon-api-types = { workspace = true, features = ["ssz"] }
hex = { workspace = true }
prost = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde-json-wasm = { workspace = true }
serde-utils = { workspace = true }
sha2 = { workspace = true }
sha3 = { workspace = true }
thiserror = { workspace = true }
beacon-api-types = { workspace = true, features = ["ssz"] }
bytes = { workspace = true }
cosmwasm-std = { version = "2.1.4", features = ["abort", "cosmwasm_2_1"] }
ethereum-light-client = { workspace = true, features = ["library"] }
hex = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
sha2 = { workspace = true }
thiserror = { workspace = true }

berachain-light-client-types = { workspace = true, features = ["proto"] }
cometbft-types = { workspace = true, features = ["proto", "hash"] }
ethereum-light-client-types = { workspace = true }
berachain-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
cometbft-types = { workspace = true, features = ["hash"] }
ethereum-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
evm-storage-verifier = { workspace = true }
hex-literal = { workspace = true }
ics008-wasm-client = { workspace = true }
ics23 = { workspace = true }
tendermint-light-client = { workspace = true, features = ["library"] }
tendermint-light-client-types = { workspace = true, features = ["proto"] }
tendermint-light-client-types = { workspace = true, features = ["serde", "ethabi"] }
tendermint-verifier = { workspace = true }
unionlabs = { workspace = true }

Expand Down
12 changes: 0 additions & 12 deletions cosmwasm/union-ibc/light-clients/berachain/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,3 @@ pub mod client;
pub mod contract;
pub mod errors;
pub mod verifier;

fn impls_send<T: Send>() {}

const _: () = {
|| {
impls_send::<
unionlabs::ibc::lightclients::wasm::client_state::TryFromWasmClientStateError<
tendermint_light_client_types::client_state::ClientState,
>,
>()
};
};
Loading

0 comments on commit f963701

Please sign in to comment.