From 81d8936e3e9c0aa38fa2e502efc21d5d221e6c1d Mon Sep 17 00:00:00 2001 From: echevrier Date: Wed, 22 Sep 2021 17:09:59 +0200 Subject: [PATCH 1/3] init in testnet_genesis the teerex allow_sgx_debug_mode to true --- Cargo.toml | 4 ++-- node/src/chain_spec.rs | 5 ++++- runtime/src/lib.rs | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1438a75..8d997f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,5 +7,5 @@ members = [ 'runtime', ] -#[patch."https://github.com/integritee-network/pallet-teerex.git"] -#pallet-teerex = { path = '../pallet-teerex' } +[patch."https://github.com/integritee-network/pallet-teerex.git"] +pallet-teerex = { path = '../pallet-teerex' } diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index f0e8ed5..e747524 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -1,6 +1,6 @@ use integritee_node_runtime::{ AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig, Multisig, Signature, SudoConfig, - SystemConfig, TreasuryPalletId, WASM_BINARY + SystemConfig, TreasuryPalletId, WASM_BINARY, TeerexConfig }; use sc_service::ChainType; use sp_consensus_aura::sr25519::AuthorityId as AuraId; @@ -391,6 +391,9 @@ fn genesis_config( // Assign network admin rights. key: root_key, }, + teerex: TeerexConfig { + allow_sgx_debug_mode : true, + }, treasury: Default::default(), vesting: Default::default(), } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1a3c8dc..e5150aa 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -525,7 +525,7 @@ construct_runtime!( Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 30, // utility - Teerex: pallet_teerex::{Pallet, Call, Storage, Event} = 50, } + Teerex: pallet_teerex::{Pallet, Call, Config, Storage, Event} = 50, } ); /// The address format for describing accounts. From 9b9e074c25049dfac0f6cf0c3d39696ecaf1842c Mon Sep 17 00:00:00 2001 From: echevrier Date: Mon, 4 Oct 2021 10:27:59 +0200 Subject: [PATCH 2/3] Remove local patch for pallet-teerex --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8d997f0..1438a75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,5 +7,5 @@ members = [ 'runtime', ] -[patch."https://github.com/integritee-network/pallet-teerex.git"] -pallet-teerex = { path = '../pallet-teerex' } +#[patch."https://github.com/integritee-network/pallet-teerex.git"] +#pallet-teerex = { path = '../pallet-teerex' } From 18c289c3a6b7134a37ff6070a3a825c746254779 Mon Sep 17 00:00:00 2001 From: echevrier Date: Mon, 4 Oct 2021 13:11:23 +0200 Subject: [PATCH 3/3] FIx Config and pallet-teerex from git --- Cargo.lock | 4 ++-- runtime/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39958de..a0d1497 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2148,7 +2148,7 @@ dependencies = [ [[package]] name = "ias-verify" version = "0.1.4" -source = "git+https://github.com/integritee-network/pallet-teerex.git?branch=master#2a2549ed5fc6ff147ec8138f653717c8e26f0cd8" +source = "git+https://github.com/integritee-network/pallet-teerex.git?branch=master#c62071ff4c6c0a4da5cd1886fbecd12350bafb8b" dependencies = [ "base64 0.11.0", "chrono", @@ -3931,7 +3931,7 @@ dependencies = [ [[package]] name = "pallet-teerex" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallet-teerex.git?branch=master#2a2549ed5fc6ff147ec8138f653717c8e26f0cd8" +source = "git+https://github.com/integritee-network/pallet-teerex.git?branch=master#c62071ff4c6c0a4da5cd1886fbecd12350bafb8b" dependencies = [ "frame-benchmarking", "frame-support", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index e5150aa..c8380af 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -525,7 +525,7 @@ construct_runtime!( Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 30, // utility - Teerex: pallet_teerex::{Pallet, Call, Config, Storage, Event} = 50, } + Teerex: pallet_teerex::{Pallet, Call, Config, Storage, Event} = 50, } ); /// The address format for describing accounts.