From 6d1f3ae8c5bc2131cd79a5023335bc845095dee4 Mon Sep 17 00:00:00 2001 From: johntaiko Date: Wed, 23 Oct 2024 15:57:47 +0800 Subject: [PATCH 1/4] fix: incorrect state transition handling (#395) --- lib/src/builder.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/builder.rs b/lib/src/builder.rs index 7e3a221a..e1dae454 100644 --- a/lib/src/builder.rs +++ b/lib/src/builder.rs @@ -203,12 +203,12 @@ impl + DatabaseCommit + OptimisticDatabase> .into_iter() .map(|(address, bundle_account)| { let mut account = Account { - info: bundle_account.info.unwrap_or_default(), + info: bundle_account.account_info().unwrap_or_default(), storage: bundle_account.storage, status: AccountStatus::default(), }; account.mark_touch(); - if bundle_account.status.was_destroyed() { + if bundle_account.info.is_none() { account.mark_selfdestruct(); } if bundle_account.original_info.is_none() { From 38a500b3717e8e90236d072832c216a8385c450c Mon Sep 17 00:00:00 2001 From: taiko-bot <160625009+taiko-kitty@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:54:26 -0700 Subject: [PATCH 2/4] chore(main): release 1.3.0 (#380) --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b0a00d3..9370feba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [1.3.0](https://github.com/taikoxyz/raiko/compare/v1.2.0...v1.3.0) (2024-10-23) + + +### Features + +* **core,host:** initial aggregation API ([#375](https://github.com/taikoxyz/raiko/issues/375)) ([eb4d032](https://github.com/taikoxyz/raiko/commit/eb4d032abf7c55d3d1d498b8f08a00250fe0a14a)) +* **docs:** update docs for 1.2.0 ([#382](https://github.com/taikoxyz/raiko/issues/382)) ([f33d211](https://github.com/taikoxyz/raiko/commit/f33d2119a66864bb34ca915349c06f6e950c94ce)) +* **raiko:** enable blob slice to support multi-blocks in single blob ([#390](https://github.com/taikoxyz/raiko/issues/390)) ([8471b16](https://github.com/taikoxyz/raiko/commit/8471b16bfe86b1d4a18a8092ab40cb5488ff824f)) +* **raiko:** merge stress test upgrades ([#392](https://github.com/taikoxyz/raiko/issues/392)) ([7f64cbe](https://github.com/taikoxyz/raiko/commit/7f64cbe72176f2f4a424c31a7946171d48d89537)) +* **raiko:** put the tasks that cannot run in parallel into pending list ([#358](https://github.com/taikoxyz/raiko/issues/358)) ([ec483b7](https://github.com/taikoxyz/raiko/commit/ec483b7e6d637b921e677ad7fb89222da7749b85)) +* **raiko:** update ontake config & docker build for next release ([#394](https://github.com/taikoxyz/raiko/issues/394)) ([4bacdac](https://github.com/taikoxyz/raiko/commit/4bacdac7ec4c28e0fad9594093840226775a7e26)) +* **raiko:** use simple contract to verify sp1 proof ([#381](https://github.com/taikoxyz/raiko/issues/381)) ([8ad5a6f](https://github.com/taikoxyz/raiko/commit/8ad5a6f1e73ad57183e353b18649baa977752206)) + + +### Bug Fixes + +* add cgroup&mountinfo for docker env ([#383](https://github.com/taikoxyz/raiko/issues/383)) ([7e61432](https://github.com/taikoxyz/raiko/commit/7e614326b199d350c24f83dd27ac08d878f105cb)) +* incorrect state transition handling ([#395](https://github.com/taikoxyz/raiko/issues/395)) ([6d1f3ae](https://github.com/taikoxyz/raiko/commit/6d1f3ae8c5bc2131cd79a5023335bc845095dee4)) +* **raiko:** add build flags to docker image build script ([#379](https://github.com/taikoxyz/raiko/issues/379)) ([2ee7d2a](https://github.com/taikoxyz/raiko/commit/2ee7d2ac1762f088c06df80d187dcfc00cfba882)) +* **raiko:** fix r0 aggregation proof format ([#386](https://github.com/taikoxyz/raiko/issues/386)) ([3cb6651](https://github.com/taikoxyz/raiko/commit/3cb6651d4adc443697473e33e24a849516e9b264)) + ## [1.2.0](https://github.com/taikoxyz/raiko/compare/v1.1.0...v1.2.0) (2024-09-20) From df371a40b0839f88d9cb21ba1dff6ed6d18dcd46 Mon Sep 17 00:00:00 2001 From: Roger <50648015+RogerLamTd@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:02:04 -0700 Subject: [PATCH 3/4] fix link for default.json (#397) --- docs/README_Docker_and_RA.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README_Docker_and_RA.md b/docs/README_Docker_and_RA.md index b11bc2fc..2681078e 100644 --- a/docs/README_Docker_and_RA.md +++ b/docs/README_Docker_and_RA.md @@ -240,7 +240,7 @@ rm csr.pem 3. Curl the config file ``` -curl -s https://raw.githubusercontent.com/intel/SGXDataCenterAttestationPrimitives/main/QuoteGeneration/pccs/config/default.json > ~/.config/sgx-pccs/default.json +curl -s https://raw.githubusercontent.com/intel/SGXDataCenterAttestationPrimitives/refs/tags/dcap_1.21_reproducible/QuoteGeneration/pccs/config/default.json > ~/.config/sgx-pccs/default.json ``` Make sure you've copied the `default.json` into the .config/sgx-pccs directory you created earlier. The `raiko` container will mount this as a volume. After copying the file, open it for editing and fill in the below listed parameters as recommended by [Intel's manual][pccs-cert-gen-config]: From 6d5b7bfdf69bb574851f7a2df529ac6dfa18fb14 Mon Sep 17 00:00:00 2001 From: Roger <50648015+RogerLamTd@users.noreply.github.com> Date: Fri, 25 Oct 2024 07:33:04 -0700 Subject: [PATCH 4/4] add default.json and link (#398) --- docs/README_Docker_and_RA.md | 8 ++--- docs/default.json | 58 ++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 docs/default.json diff --git a/docs/README_Docker_and_RA.md b/docs/README_Docker_and_RA.md index 2681078e..cda10e41 100644 --- a/docs/README_Docker_and_RA.md +++ b/docs/README_Docker_and_RA.md @@ -240,7 +240,7 @@ rm csr.pem 3. Curl the config file ``` -curl -s https://raw.githubusercontent.com/intel/SGXDataCenterAttestationPrimitives/refs/tags/dcap_1.21_reproducible/QuoteGeneration/pccs/config/default.json > ~/.config/sgx-pccs/default.json +curl -s https://raw.githubusercontent.com/taikoxyz/raiko/refs/heads/main/docs/default.json > ~/.config/sgx-pccs/default.json ``` Make sure you've copied the `default.json` into the .config/sgx-pccs directory you created earlier. The `raiko` container will mount this as a volume. After copying the file, open it for editing and fill in the below listed parameters as recommended by [Intel's manual][pccs-cert-gen-config]: @@ -282,11 +282,11 @@ docker compose build raiko If you do not wish to build the image locally, you can optionally pull them from our registry. ``` -docker pull us-docker.pkg.dev/evmchain/images/raiko:1.2.0 +docker pull us-docker.pkg.dev/evmchain/images/raiko:1.3.0 docker pull us-docker.pkg.dev/evmchain/images/pccs:latest ``` -If you do this step, you need to change your raiko docker-compose.yml to use this image. Navigate to `raiko/docker` and search for `raiko:latest` and change all instances to `raiko:1.2.0`. +If you do this step, you need to change your raiko docker-compose.yml to use this image. Navigate to `raiko/docker` and search for `raiko:latest` and change all instances to `raiko:1.3.0`. You can continue on with the following steps as usual after this. @@ -326,7 +326,7 @@ You've now prepared your machine for running Raiko through Docker. Now, you need ## On-Chain RA -1. Clone [taiko-mono](https://github.com/taikoxyz/taiko-mono/tree/main), checkout the appropriate tag (protocol-v1.9.0 for hekla) and navigate to the protocol directory. +1. Clone [taiko-mono](https://github.com/taikoxyz/taiko-mono/tree/main), checkout the appropriate tag and navigate to the protocol directory. ``` git clone https://github.com/taikoxyz/taiko-mono.git diff --git a/docs/default.json b/docs/default.json new file mode 100644 index 00000000..13e00e26 --- /dev/null +++ b/docs/default.json @@ -0,0 +1,58 @@ +{ + "HTTPS_PORT" : 8081, + "hosts" : "127.0.0.1", + "uri": "https://api.trustedservices.intel.com/sgx/certification/v4/", + "ApiKey": "", + "proxy" : "", + "RefreshSchedule": "0 0 1 * * *", + "UserTokenHash" : "", + "AdminTokenHash" : "", + "CachingFillMode" : "LAZY", + "OPENSSL_FIPS_MODE" : false, + "LogLevel" : "info", + "DB_CONFIG" : "sqlite", + "sqlite" : { + "database" : "database", + "username" : "username", + "password" : "password", + "options" : { + "host": "localhost", + "dialect": "sqlite", + "pool": { + "max": 5, + "min": 0, + "acquire": 30000, + "idle": 10000 + }, + "define": { + "freezeTableName": true + }, + "logging" : false, + "storage": "pckcache.db" + } + }, + "mysql" : { + "database" : "pckcache", + "username" : "root", + "password" : "mypass", + "options" : { + "host": "localhost", + "port": "3306", + "dialect": "mysql", + "pool": { + "max": 5, + "min": 0, + "acquire": 30000, + "idle": 10000 + }, + "define": { + "freezeTableName": true + }, + "logging" : false + }, + "ssl":{ + "required": false, + "ca":"/if_required/path/to/your_ssl_ca" + } + } +}