From 2f917543a2a2f0fadcddf702ea88f86a5ef1c240 Mon Sep 17 00:00:00 2001 From: Jun Kimura Date: Tue, 12 Nov 2024 20:37:28 +0900 Subject: [PATCH 1/3] update ethereum-elc and ethereum-ibc-relay-prover versions Signed-off-by: Jun Kimura --- README.md | 4 ++-- enclave/Cargo.lock | 10 +++++----- enclave/Cargo.toml | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d70b683..96fac18 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,12 @@ This repository contains multiple modules: - [ibc-solidity v0.3.38](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.38) - [lcp v0.2.11](https://github.com/datachainlab/lcp/releases/tag/v0.2.11) -- [ethereum-elc v0.0.20](https://github.com/datachainlab/ethereum-elc/releases/tag/v0.0.20) +- [ethereum-elc v0.0.21](https://github.com/datachainlab/ethereum-elc/releases/tag/v0.0.21) - [lcp-go v0.2.10](https://github.com/datachainlab/lcp-go/releases/tag/v0.2.10) - [lcp-solidity v0.1.15](https://github.com/datachainlab/lcp-solidity/releases/tag/v0.1.15) - [yui-relayer v0.5.8](https://github.com/hyperledger-labs/yui-relayer/releases/tag/v0.5.8) - [ethereum-ibc-relay-chain v0.3.10](https://github.com/datachainlab/ethereum-ibc-relay-chain/releases/tag/v0.3.10) -- [ethereum-ibc-relay-prover v0.3.4](https://github.com/datachainlab/ethereum-ibc-relay-prover/releases/tag/v0.3.4) +- [ethereum-ibc-relay-prover v0.3.5](https://github.com/datachainlab/ethereum-ibc-relay-prover/releases/tag/v0.3.5) ## Build enclave and run E2E test diff --git a/enclave/Cargo.lock b/enclave/Cargo.lock index 7236977..fdd737e 100644 --- a/enclave/Cargo.lock +++ b/enclave/Cargo.lock @@ -587,7 +587,7 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.0" -source = "git+https://github.com/datachainlab/ethereum-light-client-rs?rev=v0.1.4#8ef10cf5982d28cb9d71b126ca41d364dda18788" +source = "git+https://github.com/datachainlab/ethereum-light-client-rs?rev=v0.1.5#6c2b3b0f1a58c4df3eedeb9a36de0e7fcab25007" dependencies = [ "displaydoc", "hex", @@ -602,7 +602,7 @@ dependencies = [ [[package]] name = "ethereum-elc" version = "0.1.0" -source = "git+https://github.com/datachainlab/ethereum-elc?rev=v0.0.20#874843e5fc33ef8c196cf37f60b4770e0a1e37a1" +source = "git+https://github.com/datachainlab/ethereum-elc?rev=v0.0.21#ad92214df069bacffa6d895c6e04a6280493cbe6" dependencies = [ "displaydoc", "ethereum-ibc", @@ -614,7 +614,7 @@ dependencies = [ [[package]] name = "ethereum-ibc" version = "0.1.0" -source = "git+https://github.com/datachainlab/ethereum-ibc-rs?rev=v0.0.16#8243b634ae0953a9e0c2fd5f64c2b830723ab8f6" +source = "git+https://github.com/datachainlab/ethereum-ibc-rs?rev=v0.0.17#23cba6fe3ff87df2ac8d4350a49a4c2811e5e156" dependencies = [ "bytes", "displaydoc", @@ -634,7 +634,7 @@ dependencies = [ [[package]] name = "ethereum-ibc-proto" version = "0.1.0" -source = "git+https://github.com/datachainlab/ethereum-ibc-rs?rev=v0.0.16#8243b634ae0953a9e0c2fd5f64c2b830723ab8f6" +source = "git+https://github.com/datachainlab/ethereum-ibc-rs?rev=v0.0.17#23cba6fe3ff87df2ac8d4350a49a4c2811e5e156" dependencies = [ "prost", "serde", @@ -643,7 +643,7 @@ dependencies = [ [[package]] name = "ethereum-light-client-verifier" version = "0.1.0" -source = "git+https://github.com/datachainlab/ethereum-light-client-rs?rev=v0.1.4#8ef10cf5982d28cb9d71b126ca41d364dda18788" +source = "git+https://github.com/datachainlab/ethereum-light-client-rs?rev=v0.1.5#6c2b3b0f1a58c4df3eedeb9a36de0e7fcab25007" dependencies = [ "displaydoc", "ethereum-consensus", diff --git a/enclave/Cargo.toml b/enclave/Cargo.toml index 064b12f..0c9088b 100644 --- a/enclave/Cargo.toml +++ b/enclave/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["staticlib"] [dependencies] enclave-runtime = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.11" } tendermint-lc = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.11", default-features = false } -ethereum-elc = { git = "https://github.com/datachainlab/ethereum-elc", rev = "v0.0.20", default-features = false } +ethereum-elc = { git = "https://github.com/datachainlab/ethereum-elc", rev = "v0.0.21", default-features = false } [patch."crates-io"] getrandom = { git = "https://github.com/datachainlab/getrandom-sgx-lite" } diff --git a/go.mod b/go.mod index 388bccf..314a9d8 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10 - github.com/datachainlab/ethereum-ibc-relay-prover v0.3.4 + github.com/datachainlab/ethereum-ibc-relay-prover v0.3.5 github.com/datachainlab/ibc-hd-signer v0.1.0 - github.com/datachainlab/lcp-go v0.2.10 + github.com/datachainlab/lcp-go v0.2.12-0.20241111132317-83b85afb78c1 github.com/hyperledger-labs/yui-relayer v0.5.8 ) diff --git a/go.sum b/go.sum index ad3fd01..edf65c8 100644 --- a/go.sum +++ b/go.sum @@ -432,12 +432,12 @@ github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuA github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10 h1:ce7/EiUZDjTWGHr8VGwP8Maqqur0koxK2qCOLty6gJs= github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10/go.mod h1:7goF50HLpKyL6bmisyY7t9QV338WC+68GqGpaZ9Te24= -github.com/datachainlab/ethereum-ibc-relay-prover v0.3.4 h1:v+3ubFZOgU1U+tihjsqRAtrDqK2P8ri2j8dJWVZKqpU= -github.com/datachainlab/ethereum-ibc-relay-prover v0.3.4/go.mod h1:OfuufukSThjjZXQtFyZqwY9csQNrJ/wIm0VLAUw3l4g= +github.com/datachainlab/ethereum-ibc-relay-prover v0.3.5 h1:vX48E2uPme0P9MW2zqGIvavPvdq6v01NU7Wql8WGjHk= +github.com/datachainlab/ethereum-ibc-relay-prover v0.3.5/go.mod h1:OfuufukSThjjZXQtFyZqwY9csQNrJ/wIm0VLAUw3l4g= github.com/datachainlab/ibc-hd-signer v0.1.0 h1:dmnFTAwFpl0m7Lx6+b+N/rrNpHQnXpyJAYnM25GhDi0= github.com/datachainlab/ibc-hd-signer v0.1.0/go.mod h1:wUbLb2EryMCY+GfEsziU0T032Gch04jmrN0D4XGAfOI= -github.com/datachainlab/lcp-go v0.2.10 h1:1c8C+HR+tC/4NjCjpuz+Nkk3I/uIQ3PNRcvJKsSU948= -github.com/datachainlab/lcp-go v0.2.10/go.mod h1:0ivRb4qUiZz5UQxsbRKygQyFz0XC6TIC6YpEUdOc1So= +github.com/datachainlab/lcp-go v0.2.12-0.20241111132317-83b85afb78c1 h1:+YCGZcub6o9WkwnstiLxNTQRepIqHsddr3YmtQP+tus= +github.com/datachainlab/lcp-go v0.2.12-0.20241111132317-83b85afb78c1/go.mod h1:0ivRb4qUiZz5UQxsbRKygQyFz0XC6TIC6YpEUdOc1So= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From f6126c7eeef4256cab1e288fc1383011f746dcee Mon Sep 17 00:00:00 2001 From: Jun Kimura Date: Tue, 12 Nov 2024 20:38:47 +0900 Subject: [PATCH 2/3] add `SW_HARDENING_NEEDED` to allowed quote statuses Signed-off-by: Jun Kimura --- tests/e2e/cases/tm2eth/configs/templates/ibc-0.json.tpl | 2 +- tests/e2e/cases/tm2eth/configs/templates/ibc-1.json.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/cases/tm2eth/configs/templates/ibc-0.json.tpl b/tests/e2e/cases/tm2eth/configs/templates/ibc-0.json.tpl index 04c118f..de25f09 100644 --- a/tests/e2e/cases/tm2eth/configs/templates/ibc-0.json.tpl +++ b/tests/e2e/cases/tm2eth/configs/templates/ibc-0.json.tpl @@ -22,7 +22,7 @@ }, "lcp_service_address": "localhost:50051", "mrenclave": $MRENCLAVE, - "allowed_quote_statuses": ["GROUP_OUT_OF_DATE"], + "allowed_quote_statuses": ["SW_HARDENING_NEEDED", "GROUP_OUT_OF_DATE"], "allowed_advisory_ids": ["INTEL-SA-00219","INTEL-SA-00289","INTEL-SA-00334","INTEL-SA-00477","INTEL-SA-00614","INTEL-SA-00615","INTEL-SA-00617", "INTEL-SA-00828"], "key_expiration": 604800, "elc_client_id": "07-tendermint-1", diff --git a/tests/e2e/cases/tm2eth/configs/templates/ibc-1.json.tpl b/tests/e2e/cases/tm2eth/configs/templates/ibc-1.json.tpl index 8586d00..3c25b3f 100644 --- a/tests/e2e/cases/tm2eth/configs/templates/ibc-1.json.tpl +++ b/tests/e2e/cases/tm2eth/configs/templates/ibc-1.json.tpl @@ -46,7 +46,7 @@ }, "lcp_service_address": "localhost:50051", "mrenclave": $MRENCLAVE, - "allowed_quote_statuses": ["GROUP_OUT_OF_DATE"], + "allowed_quote_statuses": ["SW_HARDENING_NEEDED", "GROUP_OUT_OF_DATE"], "allowed_advisory_ids": ["INTEL-SA-00219","INTEL-SA-00289","INTEL-SA-00334","INTEL-SA-00477","INTEL-SA-00614","INTEL-SA-00615","INTEL-SA-00617", "INTEL-SA-00828"], "key_expiration": 604800, "elc_client_id": "ethereum-0", From 2e076f52bd839394ac78a5f4e6a663c533fe6449 Mon Sep 17 00:00:00 2001 From: Jun Kimura Date: Tue, 12 Nov 2024 21:27:42 +0900 Subject: [PATCH 3/3] update lcp-go to v0.2.12 Signed-off-by: Jun Kimura --- README.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 96fac18..d6232eb 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ This repository contains multiple modules: - [ibc-solidity v0.3.38](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.38) - [lcp v0.2.11](https://github.com/datachainlab/lcp/releases/tag/v0.2.11) - [ethereum-elc v0.0.21](https://github.com/datachainlab/ethereum-elc/releases/tag/v0.0.21) -- [lcp-go v0.2.10](https://github.com/datachainlab/lcp-go/releases/tag/v0.2.10) +- [lcp-go v0.2.12](https://github.com/datachainlab/lcp-go/releases/tag/v0.2.12) - [lcp-solidity v0.1.15](https://github.com/datachainlab/lcp-solidity/releases/tag/v0.1.15) - [yui-relayer v0.5.8](https://github.com/hyperledger-labs/yui-relayer/releases/tag/v0.5.8) - [ethereum-ibc-relay-chain v0.3.10](https://github.com/datachainlab/ethereum-ibc-relay-chain/releases/tag/v0.3.10) diff --git a/go.mod b/go.mod index 314a9d8..e7d6fa3 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/datachainlab/ethereum-ibc-relay-chain v0.3.10 github.com/datachainlab/ethereum-ibc-relay-prover v0.3.5 github.com/datachainlab/ibc-hd-signer v0.1.0 - github.com/datachainlab/lcp-go v0.2.12-0.20241111132317-83b85afb78c1 + github.com/datachainlab/lcp-go v0.2.12 github.com/hyperledger-labs/yui-relayer v0.5.8 ) diff --git a/go.sum b/go.sum index edf65c8..b1d37da 100644 --- a/go.sum +++ b/go.sum @@ -436,8 +436,8 @@ github.com/datachainlab/ethereum-ibc-relay-prover v0.3.5 h1:vX48E2uPme0P9MW2zqGI github.com/datachainlab/ethereum-ibc-relay-prover v0.3.5/go.mod h1:OfuufukSThjjZXQtFyZqwY9csQNrJ/wIm0VLAUw3l4g= github.com/datachainlab/ibc-hd-signer v0.1.0 h1:dmnFTAwFpl0m7Lx6+b+N/rrNpHQnXpyJAYnM25GhDi0= github.com/datachainlab/ibc-hd-signer v0.1.0/go.mod h1:wUbLb2EryMCY+GfEsziU0T032Gch04jmrN0D4XGAfOI= -github.com/datachainlab/lcp-go v0.2.12-0.20241111132317-83b85afb78c1 h1:+YCGZcub6o9WkwnstiLxNTQRepIqHsddr3YmtQP+tus= -github.com/datachainlab/lcp-go v0.2.12-0.20241111132317-83b85afb78c1/go.mod h1:0ivRb4qUiZz5UQxsbRKygQyFz0XC6TIC6YpEUdOc1So= +github.com/datachainlab/lcp-go v0.2.12 h1:k+gP2KSHUTzPkUXF5Khlbmq60UDlYfMhmW4aPiRo0a4= +github.com/datachainlab/lcp-go v0.2.12/go.mod h1:0ivRb4qUiZz5UQxsbRKygQyFz0XC6TIC6YpEUdOc1So= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=