Skip to content

Commit 091d42e

Browse files
BillyWoooKailai-WangBillyWooo
authored
merge tee-dev branch into dev branch (#902)
* adjust docker tag for tee-dev * use integritee/pallets master branch * add teeracle to tee-dev * switch to sdk-v0.9.0-polkadot-v0.9.26 as release branch * add back the dummy method for testing purpose * fix make clippy * small cleanup * add back teeracle * use specific branch of tee-primitives (todo:revert it) * correctify branch for tee-primitives * temporarily use TEE pallets master branch * add EnsureOrigin impl and tests * its better to place it in runtime_common * remove the dummy extrinsic (used for testing previous) Co-authored-by: Kailai Wang <[email protected]> Co-authored-by: BillyWooo <[email protected]>
1 parent eb722ce commit 091d42e

File tree

6 files changed

+83
-5
lines changed

6 files changed

+83
-5
lines changed

Cargo.lock

Lines changed: 58 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker/litmus-parachain-launch-config.tee-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ relaychain:
2323

2424
# Parachain Configuration
2525
parachains:
26-
- image: litentry/litentry-parachain:tee
26+
- image: litentry/litentry-parachain:tee-dev
2727
chain: litmus-dev
2828
id: 2106
2929
parachain: true

runtime/litmus/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ runtime-common = { path = '../common', default-features = false }
9999
# TEE pallets
100100
# TODO: change to `master` branch temporarily for aligning upstream codebase: tee-worker/#113
101101
pallet-sidechain = { git = "https://github.com/integritee-network/pallets.git", default-features = false, branch = "master" }
102+
pallet-teeracle = { git = "https://github.com/integritee-network/pallets.git", default-features = false, branch = "master" }
102103
pallet-teerex = { git = "https://github.com/integritee-network/pallets.git", default-features = false, branch = "master" }
103104

104105
[dev-dependencies]
@@ -187,6 +188,7 @@ std = [
187188
"pallet-identity-management-mock/std",
188189
"pallet-teerex/std",
189190
"pallet-sidechain/std",
191+
"pallet-teeracle/std",
190192
"pallet-vc-management/std",
191193
]
192194
tee-dev = [
@@ -225,6 +227,7 @@ runtime-benchmarks = [
225227
"pallet-identity-management/runtime-benchmarks",
226228
"pallet-teerex/runtime-benchmarks",
227229
"pallet-sidechain/runtime-benchmarks",
230+
"pallet-teeracle/runtime-benchmarks",
228231
"pallet-vc-management/runtime-benchmarks",
229232
]
230233
try-runtime = [

runtime/litmus/src/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ use hex_literal::hex;
3939
// for TEE
4040
pub use pallet_balances::Call as BalancesCall;
4141
pub use pallet_sidechain;
42+
pub use pallet_teeracle;
4243
pub use pallet_teerex;
4344

4445
use sp_api::impl_runtime_apis;
@@ -783,6 +784,12 @@ impl pallet_sidechain::Config for Runtime {
783784
type EarlyBlockProposalLenience = ConstU64<100>;
784785
}
785786

787+
impl pallet_teeracle::Config for Runtime {
788+
type Event = Event;
789+
type WeightInfo = ();
790+
type MaxWhitelistedReleases = ConstU32<10>;
791+
}
792+
786793
impl pallet_identity_management::Config for Runtime {
787794
type Event = Event;
788795
type WeightInfo = ();
@@ -881,6 +888,7 @@ construct_runtime! {
881888
// TEE
882889
Teerex: pallet_teerex = 90,
883890
Sidechain: pallet_sidechain = 91,
891+
Teeracle: pallet_teeracle = 92,
884892

885893
// Mock
886894
IdentityManagementMock: pallet_identity_management_mock = 100,
@@ -973,6 +981,7 @@ mod benches {
973981
[pallet_identity_management, IdentityManagement]
974982
[pallet_teerex, Teerex]
975983
[pallet_sidechain, Sidechain]
984+
[pallet_teeracle, Teeracle]
976985
[pallet_bridge,ChainBridge]
977986
[pallet_bridge_transfer,BridgeTransfer]
978987
);

runtime/rococo/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ runtime-common = { path = '../common', default-features = false }
101101
# TEE pallets
102102
# TODO: change to `master` branch temporarily for aligning upstream codebase: tee-worker/#113
103103
pallet-sidechain = { git = "https://github.com/integritee-network/pallets.git", default-features = false, branch = "master" }
104+
pallet-teeracle = { git = "https://github.com/integritee-network/pallets.git", default-features = false, branch = "master" }
104105
pallet-teerex = { git = "https://github.com/integritee-network/pallets.git", default-features = false, branch = "master" }
105106

106107
[dev-dependencies]
@@ -152,6 +153,7 @@ runtime-benchmarks = [
152153
"pallet-identity-management/runtime-benchmarks",
153154
"pallet-teerex/runtime-benchmarks",
154155
"pallet-sidechain/runtime-benchmarks",
156+
"pallet-teeracle/runtime-benchmarks",
155157
"pallet-vc-management/runtime-benchmarks",
156158
]
157159
std = [
@@ -226,6 +228,7 @@ std = [
226228
"pallet-identity-management-mock/std",
227229
"pallet-teerex/std",
228230
"pallet-sidechain/std",
231+
"pallet-teeracle/std",
229232
"pallet-vc-management/std",
230233
]
231234
tee-dev = [

runtime/rococo/src/lib.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use hex_literal::hex;
4040
// for TEE
4141
pub use pallet_balances::Call as BalancesCall;
4242
pub use pallet_sidechain;
43+
pub use pallet_teeracle;
4344
pub use pallet_teerex;
4445

4546
use sp_api::impl_runtime_apis;
@@ -853,6 +854,12 @@ impl pallet_sidechain::Config for Runtime {
853854
type EarlyBlockProposalLenience = ConstU64<100>;
854855
}
855856

857+
impl pallet_teeracle::Config for Runtime {
858+
type Event = Event;
859+
type WeightInfo = ();
860+
type MaxWhitelistedReleases = ConstU32<10>;
861+
}
862+
856863
impl pallet_identity_management::Config for Runtime {
857864
type Event = Event;
858865
type WeightInfo = ();
@@ -953,6 +960,7 @@ construct_runtime! {
953960
// TEE
954961
Teerex: pallet_teerex = 90,
955962
Sidechain: pallet_sidechain = 91,
963+
Teeracle: pallet_teeracle = 92,
956964

957965
// Mock
958966
IdentityManagementMock: pallet_identity_management_mock = 100,
@@ -1059,6 +1067,7 @@ mod benches {
10591067
[pallet_identity_management, IdentityManagement]
10601068
[pallet_teerex, Teerex]
10611069
[pallet_sidechain, Sidechain]
1070+
[pallet_teeracle, Teeracle]
10621071
[pallet_bridge,ChainBridge]
10631072
[pallet_bridge_transfer,BridgeTransfer]
10641073
);

0 commit comments

Comments
 (0)