From af9f5d839b172ef3f1b1849212f37937bd5f9561 Mon Sep 17 00:00:00 2001 From: yoshidan Date: Wed, 25 Sep 2024 09:59:25 +0900 Subject: [PATCH] Follow cosmos-ethereum-ibc-lcp v0.2.13 Signed-off-by: yoshidan --- enclave/Cargo.lock | 185 ++++++++++++++++++++++++++++++++------------- enclave/Cargo.toml | 4 +- enclave/src/lib.rs | 1 + lcp | 2 +- 4 files changed, 136 insertions(+), 56 deletions(-) diff --git a/enclave/Cargo.lock b/enclave/Cargo.lock index f286947..917ea79 100644 --- a/enclave/Cargo.lock +++ b/enclave/Cargo.lock @@ -96,14 +96,14 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "attestation-report" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "base64 0.22.1", "chrono", - "crypto", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "flex-error", "hex", - "lcp-types", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "pem", "serde", "serde_json", @@ -181,9 +181,9 @@ dependencies = [ [[package]] name = "borsh" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "115e54d64eb62cdebad391c19efc9dce4981c690c85a33a12199d99bb9546fee" dependencies = [ "borsh-derive", "hashbrown 0.13.2", @@ -191,9 +191,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +checksum = "831213f80d9423998dd696e2c5345aba6be7a0bd8cd19e31c5243e13df1cef89" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +checksum = "65d6ba50644c98714aa2a70d13d7df3cd75cd2b523a2b452bf010443800976b3" dependencies = [ "proc-macro2", "quote", @@ -215,9 +215,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "276691d96f063427be83e6692b86148e488ebba9f48f77788724ca027ba3b6d4" dependencies = [ "proc-macro2", "quote", @@ -267,10 +267,25 @@ version = "0.1.0" source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" dependencies = [ "alloy-sol-types", - "crypto", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", + "flex-error", + "hex", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", + "prost", + "serde", + "sha2 0.10.6", +] + +[[package]] +name = "commitments" +version = "0.1.0" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" +dependencies = [ + "alloy-sol-types", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "flex-error", "hex", - "lcp-types", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "prost", "serde", "sha2 0.10.6", @@ -298,12 +313,12 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "context" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ - "crypto", - "lcp-types", - "light-client", - "store", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "light-client 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] @@ -331,6 +346,20 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" name = "crypto" version = "0.1.0" source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +dependencies = [ + "flex-error", + "hex", + "libsecp256k1", + "serde", + "serde-big-array", + "sgx_types", + "tiny-keccak 1.5.0", +] + +[[package]] +name = "crypto" +version = "0.1.0" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "flex-error", "hex", @@ -493,34 +522,34 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecall-commands" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ - "commitments", - "crypto", + "commitments 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "flex-error", - "lcp-types", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "serde", "serde_with", "sgx_types", - "store", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] name = "ecall-handler" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "attestation-report", "context", - "crypto", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "ecall-commands", "enclave-environment", "flex-error", - "lcp-types", - "light-client", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "light-client 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "sgx_tse", "sgx_types", - "store", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] @@ -596,17 +625,17 @@ dependencies = [ [[package]] name = "enclave-environment" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "host-api", - "light-client", - "store", + "light-client 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] name = "enclave-runtime" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "bincode", "ecall-commands", @@ -625,7 +654,7 @@ dependencies = [ [[package]] name = "enclave-utils" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "log", "sgx_trts", @@ -862,13 +891,13 @@ dependencies = [ [[package]] name = "host-api" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "bincode", "flex-error", "ocall-commands", "sgx_types", - "store", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] @@ -1015,6 +1044,16 @@ dependencies = [ "serde", ] +[[package]] +name = "lcp-proto" +version = "0.1.0" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" +dependencies = [ + "ibc-proto", + "prost", + "serde", +] + [[package]] name = "lcp-types" version = "0.1.0" @@ -1023,19 +1062,35 @@ dependencies = [ "flex-error", "hex", "ibc", - "lcp-proto", + "lcp-proto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", + "prost", + "serde", + "serde_json", + "sgx_types", + "tendermint", +] + +[[package]] +name = "lcp-types" +version = "0.1.0" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" +dependencies = [ + "flex-error", + "hex", + "lcp-proto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "prost", "serde", "serde_json", + "serde_with", "sgx_types", "tendermint", ] [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -1097,13 +1152,27 @@ version = "0.1.0" source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" dependencies = [ "bincode", - "commitments", + "commitments 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", "derive_more", "flex-error", "ibc", - "lcp-types", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", "serde", - "store", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", +] + +[[package]] +name = "light-client" +version = "0.1.0" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" +dependencies = [ + "bincode", + "commitments 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "derive_more", + "flex-error", + "lcp-types 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", + "serde", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] @@ -1163,10 +1232,10 @@ dependencies = [ [[package]] name = "ocall-commands" version = "0.1.0" -source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" dependencies = [ "serde", - "store", + "store 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", ] [[package]] @@ -1232,12 +1301,12 @@ dependencies = [ [[package]] name = "parlia-elc" version = "0.2.9" -source = "git+https://github.com/datachainlab/parlia-elc?rev=v0.3.2#3a92c14766206c52cd9e75e59e2c1109e674a700" +source = "git+https://github.com/datachainlab/parlia-elc?rev=v0.3.3#ce4988f8a5aa560174a86148d369d01975d187b4" dependencies = [ "elliptic-curve", "hex-literal", "k256", - "light-client", + "light-client 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.11)", "milagro_bls", "parlia-ibc-proto", "patricia-merkle-trie", @@ -1253,7 +1322,7 @@ dependencies = [ [[package]] name = "parlia-ibc-proto" version = "0.2.0" -source = "git+https://github.com/datachainlab/parlia-elc?rev=v0.3.2#3a92c14766206c52cd9e75e59e2c1109e674a700" +source = "git+https://github.com/datachainlab/parlia-elc?rev=v0.3.3#ce4988f8a5aa560174a86148d369d01975d187b4" dependencies = [ "ibc-proto", "prost", @@ -1855,6 +1924,16 @@ dependencies = [ "serde", ] +[[package]] +name = "store" +version = "0.1.0" +source = "git+https://github.com/datachainlab/lcp?rev=v0.2.11#4df1e8deb51f284d3c44136ff1a8c31dddc4bd90" +dependencies = [ + "flex-error", + "log", + "serde", +] + [[package]] name = "strsim" version = "0.11.1" @@ -1962,11 +2041,11 @@ name = "tendermint-lc" version = "0.1.0" source = "git+https://github.com/datachainlab/lcp?rev=v0.2.10#69ffe7d94b186b2761e45ebda306be35dc30b001" dependencies = [ - "crypto", + "crypto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", "flex-error", "ibc", - "lcp-proto", - "light-client", + "lcp-proto 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", + "light-client 0.1.0 (git+https://github.com/datachainlab/lcp?rev=v0.2.10)", "log", "serde", "tendermint-light-client-verifier", @@ -2064,9 +2143,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", @@ -2173,9 +2252,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "c52ac009d615e79296318c1bcce2d422aaca15ad08515e344feeda07df67a587" dependencies = [ "memchr", ] diff --git a/enclave/Cargo.toml b/enclave/Cargo.toml index fb0f2fc..f458678 100644 --- a/enclave/Cargo.toml +++ b/enclave/Cargo.toml @@ -9,9 +9,9 @@ name = "proxy_enclave" crate-type = ["staticlib"] [dependencies] -enclave-runtime = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.10" } +enclave-runtime = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.11" } tendermint-lc = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.10", default-features = false } -parlia-elc = { git = "https://github.com/datachainlab/parlia-elc", rev = "v0.3.2", default-features = false, features=["dev"] } +parlia-elc = { git = "https://github.com/datachainlab/parlia-elc", rev = "v0.3.3", default-features = false, features=["dev"] } [patch."crates-io"] getrandom = { git = "https://github.com/datachainlab/getrandom-sgx-lite" } diff --git a/enclave/src/lib.rs b/enclave/src/lib.rs index 3062742..0e70996 100644 --- a/enclave/src/lib.rs +++ b/enclave/src/lib.rs @@ -11,5 +11,6 @@ fn build_lc_registry() -> MapLightClientRegistry { let mut registry = MapLightClientRegistry::new(); tendermint_lc::register_implementations(&mut registry); parlia_elc::register_implementations(&mut registry); + registry.seal().unwrap(); registry } diff --git a/lcp b/lcp index 69ffe7d..4df1e8d 160000 --- a/lcp +++ b/lcp @@ -1 +1 @@ -Subproject commit 69ffe7d94b186b2761e45ebda306be35dc30b001 +Subproject commit 4df1e8deb51f284d3c44136ff1a8c31dddc4bd90