From a1709f2b22541f7c2c1bc81e1ed5ed56f930a3a4 Mon Sep 17 00:00:00 2001 From: clangenb <37865735+clangenb@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:06:28 +0200 Subject: [PATCH] Support the `CheckMetadataHash` signed extension (#1603) * bump api-client to a fork supporting the `CheckMetadataHash` signed extension * [local-setup] update integritee-node cli args for v1.13.0 * update docker image for integritee-node in CI * [docker] fix integritee node default tag and flags --- .github/workflows/build_and_test.yml | 18 +++++++++--------- Cargo.lock | 10 +++++----- app-libs/parentchain-interface/Cargo.toml | 2 +- cli/Cargo.toml | 4 ++-- core-primitives/extrinsics-factory/Cargo.toml | 2 +- .../node-api/api-client-extensions/Cargo.toml | 2 +- .../node-api/api-client-types/Cargo.toml | 2 +- core-primitives/types/Cargo.toml | 2 +- docker/docker-compose.yml | 4 ++-- enclave-runtime/Cargo.lock | 8 ++++---- local-setup/config/benchmark.json | 5 +---- local-setup/config/one-worker.json | 5 +---- local-setup/config/three-nodes-one-worker.json | 5 +---- local-setup/config/two-workers.json | 5 +---- service/Cargo.toml | 2 +- 15 files changed, 32 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 7dc74ff587..2cdf308284 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -257,7 +257,7 @@ jobs: integration-tests: runs-on: ${{ matrix.host }} if: ${{ always() }} - needs: [build-test, build-client] + needs: [ build-test, build-client ] env: WORKER_IMAGE_TAG: integritee-worker:dev CLIENT_IMAGE_TAG: integritee-cli:dev @@ -290,11 +290,11 @@ jobs: demo_name: demo-shielding-unshielding-multiworker host: test-runner-sgx sgx_mode: HW -# - test: Teeracle -# flavor_id: teeracle -# demo_name: demo-teeracle -# host: test-runner-sgx -# sgx_mode: HW + # - test: Teeracle + # flavor_id: teeracle + # demo_name: demo-teeracle + # host: test-runner-sgx + # sgx_mode: HW - test: Teeracle flavor_id: teeracle demo_name: demo-teeracle-generic @@ -323,7 +323,7 @@ jobs: echo "PROJECT=${{ matrix.flavor_id }}-${{ matrix.demo_name }}" >> $GITHUB_ENV echo "VERSION=dev.$version" >> $GITHUB_ENV echo "WORKER_IMAGE_TAG=integritee-worker:dev.$version" >> $GITHUB_ENV - echo "INTEGRITEE_NODE=integritee-node:1.1.6.$version" >> $GITHUB_ENV + echo "INTEGRITEE_NODE=integritee-node:1.13.0.$version" >> $GITHUB_ENV echo "CLIENT_IMAGE_TAG=integritee-cli:dev.$version" >> $GITHUB_ENV if [[ ${{ matrix.sgx_mode }} == 'HW' ]]; then echo "SGX_PROVISION=/dev/sgx/provision" >> $GITHUB_ENV @@ -368,8 +368,8 @@ jobs: fi docker tag integritee-worker-${{ env.IMAGE_SUFFIX }} ${{ env.WORKER_IMAGE_TAG }} docker tag integritee-cli-client-${{ env.IMAGE_SUFFIX }} ${{ env.CLIENT_IMAGE_TAG }} - docker pull integritee/integritee-node:1.1.6 - docker tag integritee/integritee-node:1.1.6 ${{ env.INTEGRITEE_NODE }} + docker pull integritee/integritee-node:1.13.0 + docker tag integritee/integritee-node:1.13.0 ${{ env.INTEGRITEE_NODE }} docker images --all ## diff --git a/Cargo.lock b/Cargo.lock index f02c29e4b5..b70180f107 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "ac-compose-macros" version = "0.4.2" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "ac-primitives", "log 0.4.20", @@ -25,7 +25,7 @@ dependencies = [ [[package]] name = "ac-node-api" version = "0.5.1" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "ac-primitives", "bitvec", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "ac-primitives" version = "0.9.0" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "frame-system", "impl-serde", @@ -7709,7 +7709,7 @@ dependencies = [ [[package]] name = "substrate-api-client" version = "0.14.0" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "ac-compose-macros", "ac-node-api", @@ -7747,7 +7747,7 @@ dependencies = [ [[package]] name = "substrate-client-keystore" version = "0.9.1" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "array-bytes 4.2.0", "async-trait", diff --git a/app-libs/parentchain-interface/Cargo.toml b/app-libs/parentchain-interface/Cargo.toml index 017a97bd9e..547db7dbf8 100644 --- a/app-libs/parentchain-interface/Cargo.toml +++ b/app-libs/parentchain-interface/Cargo.toml @@ -25,7 +25,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = log = { version = "0.4", default-features = false } regex = { optional = true, version = "1.9.5" } -substrate-api-client = { optional = true, default-features = false, features = ["std", "sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { optional = true, default-features = false, features = ["std", "sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } # substrate dep sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 319d149a1e..c70c29882d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -36,8 +36,8 @@ teeracle-primitives = { git = "https://github.com/integritee-network/pallets.git # `default-features = false` to remove the jsonrpsee dependency. # disable unsupported jsonrpcsee -substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } -substrate-client-keystore = { git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } +substrate-client-keystore = { git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } # substrate dependencies pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" } diff --git a/core-primitives/extrinsics-factory/Cargo.toml b/core-primitives/extrinsics-factory/Cargo.toml index 7622e32ae9..03b46495b9 100644 --- a/core-primitives/extrinsics-factory/Cargo.toml +++ b/core-primitives/extrinsics-factory/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" # sgx dependencies sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true } sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" } -substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } # local dependencies itp-node-api = { path = "../node-api", default-features = false } diff --git a/core-primitives/node-api/api-client-extensions/Cargo.toml b/core-primitives/node-api/api-client-extensions/Cargo.toml index 67834a9249..7e26739752 100644 --- a/core-primitives/node-api/api-client-extensions/Cargo.toml +++ b/core-primitives/node-api/api-client-extensions/Cargo.toml @@ -13,7 +13,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "po # scs # `default-features = false` to remove the jsonrpsee dependency. -substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } # local deps itp-api-client-types = { path = "../api-client-types" } diff --git a/core-primitives/node-api/api-client-types/Cargo.toml b/core-primitives/node-api/api-client-types/Cargo.toml index bb0070bc58..e67051c134 100644 --- a/core-primitives/node-api/api-client-types/Cargo.toml +++ b/core-primitives/node-api/api-client-types/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] itp-types = { default-features = false, path = "../../types" } sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" } -substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } [features] default = ["std"] diff --git a/core-primitives/types/Cargo.toml b/core-primitives/types/Cargo.toml index aecb7c4626..ba9681fbb7 100644 --- a/core-primitives/types/Cargo.toml +++ b/core-primitives/types/Cargo.toml @@ -17,7 +17,7 @@ itp-stf-primitives = { path = "../../core-primitives/stf-primitives", default-fe itp-utils = { path = "../../core-primitives/utils", default-features = false } # scs -substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } # substrate-deps frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" } diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 385f2cb7f7..52800a2e27 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,6 +1,6 @@ services: "integritee-node-${VERSION}": - image: "${INTEGRITEE_NODE:-integritee/integritee-node:1.1.6}" + image: "${INTEGRITEE_NODE:-integritee/integritee-node:1.13.0}" hostname: integritee-node devices: - "${SGX_PROVISION:-/dev/null}:/dev/sgx/provision" @@ -15,7 +15,7 @@ services: interval: 10s timeout: 10s retries: 6 - command: -lruntime=info -lteerex=debug --dev --rpc-methods unsafe --ws-external --rpc-external --ws-port 9912 + command: -lruntime=info -lteerex=debug --dev --rpc-methods unsafe --rpc-external --rpc-port 9912 #logging: #driver: local "integritee-worker-1-${VERSION}": diff --git a/enclave-runtime/Cargo.lock b/enclave-runtime/Cargo.lock index 3df32ee4b3..1ebdef0211 100644 --- a/enclave-runtime/Cargo.lock +++ b/enclave-runtime/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "ac-compose-macros" version = "0.4.2" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "ac-primitives", "log", @@ -25,7 +25,7 @@ dependencies = [ [[package]] name = "ac-node-api" version = "0.5.1" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "ac-primitives", "bitvec", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "ac-primitives" version = "0.9.0" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "impl-serde", "parity-scale-codec", @@ -4404,7 +4404,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "substrate-api-client" version = "0.14.0" -source = "git+https://github.com/brenzi/substrate-api-client.git?branch=polkadot-v0.9.42-tag-v0.14.0-retracted#d01bc07fe0c8a8db1451d0d5c8bf82493b274d80" +source = "git+https://github.com/encointer/substrate-api-client.git?branch=v0.9.42-tag-v0.14.0-retracted-check-metadata-hash#eddca35c73b5e2e3d0371fa923a0ba605c2f0d61" dependencies = [ "ac-compose-macros", "ac-node-api", diff --git a/local-setup/config/benchmark.json b/local-setup/config/benchmark.json index f997396e3a..665e4817ce 100644 --- a/local-setup/config/benchmark.json +++ b/local-setup/config/benchmark.json @@ -7,13 +7,10 @@ "--dev", "-lruntime=info", "-lteerex=debug", - "--ws-port", - "9944", "--port", "30390", "--rpc-port", - "9933", - "--ws-external", + "9944", "--rpc-external" ] } diff --git a/local-setup/config/one-worker.json b/local-setup/config/one-worker.json index dae7125985..8bbf151d78 100644 --- a/local-setup/config/one-worker.json +++ b/local-setup/config/one-worker.json @@ -7,13 +7,10 @@ "--dev", "-lruntime=info", "-lteerex=debug", - "--ws-port", - "9944", "--port", "30390", "--rpc-port", - "9933", - "--ws-external", + "9944", "--rpc-external" ] } diff --git a/local-setup/config/three-nodes-one-worker.json b/local-setup/config/three-nodes-one-worker.json index f01b325153..5171eaba44 100644 --- a/local-setup/config/three-nodes-one-worker.json +++ b/local-setup/config/three-nodes-one-worker.json @@ -7,13 +7,10 @@ "--dev", "-lruntime=info", "-lteerex=debug", - "--ws-port", - "9944", "--port", "30390", "--rpc-port", - "9933", - "--ws-external", + "9944", "--rpc-external" ] }, diff --git a/local-setup/config/two-workers.json b/local-setup/config/two-workers.json index dc9fe7cf5f..459732c49f 100644 --- a/local-setup/config/two-workers.json +++ b/local-setup/config/two-workers.json @@ -7,13 +7,10 @@ "--dev", "-lruntime=info", "-lteerex=debug", - "--ws-port", - "9944", "--port", "30390", "--rpc-port", - "9933", - "--ws-external", + "9944", "--rpc-external" ] } diff --git a/service/Cargo.toml b/service/Cargo.toml index 82f7d0f821..a9b4a7eb7e 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -65,7 +65,7 @@ sgx-verify = { git = "https://github.com/integritee-network/pallets.git", branch # `default-features = false` to remove the jsonrpsee dependency. enclave-bridge-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.13.0-polkadot-v0.9.42" } # disable unsupported jsonrpcsee -substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/brenzi/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0-retracted" } +substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/encointer/substrate-api-client.git", branch = "v0.9.42-tag-v0.14.0-retracted-check-metadata-hash" } teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.13.0-polkadot-v0.9.42" } # Substrate dependencies