Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move pallet-parentchain to worker directory #3105

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Move pallet-parentchain to worker directory #3105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c069917
Move pallet-parentchain to worker directory
Kailai-Wang Sep 28, 2024
165d548
update toml
Kailai-Wang Sep 28, 2024
2f54f97
Merge branch 'dev' into move-worker-pallets
Kailai-Wang Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ members = [
'runtime/paseo',
'runtime/common',
]
exclude = [
'worker-pallets',
]
exclude = []

[profile.release]
opt-level = 3
Expand Down
38 changes: 0 additions & 38 deletions parachain/worker-pallets/parentchain/Cargo.toml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tee-worker/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion tee-worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ members = [
"common/litentry/core/parachain-extrinsic-task/receiver",
"common/litentry/core/teebag-storage",
"common/litentry/macros",
"common/litentry/pallets/identity-management",
"common/litentry/pallets/*",
"common/litentry/primitives",

"common/core/parentchain/light-client",
Expand Down Expand Up @@ -272,6 +272,7 @@ itp-test = { path = "common/core-primitives/test", default-features = false }
# litentry
litentry-primitives = { path = "common/litentry/primitives", default-features = false }
litentry-worker-macros = { path = "common/litentry/macros" }
pallet-parentchain = { path = "common/litentry/pallets/parentchain", default-features = false }
pallet-identity-management-tee = { path = "common/litentry/pallets/identity-management", default-features = false }
lc-teebag-storage = { path = "common/litentry/core/teebag-storage", default-features = false }
lc-parachain-extrinsic-task-sender = { path = "common/litentry/core/parachain-extrinsic-task/sender", default-features = false }
Expand Down
3 changes: 1 addition & 2 deletions tee-worker/bitacross/app-libs/sgx-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }
sp-version = { workspace = true }

# TODO - move to tee-worker pallets
pallet-parentchain = { path = "../../../../parachain/worker-pallets/parentchain", default-features = false }
pallet-parentchain = { workspace = true }

[features]
default = ["std"]
Expand Down
9 changes: 2 additions & 7 deletions tee-worker/bitacross/app-libs/stf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ sp-core = { workspace = true, features = ["full_crypto"] }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

litentry-macros = { path = "../../../../common/primitives/core/macros", default-features = false }
litentry-macros = { workspace = true }
litentry-primitives = { workspace = true }
pallet-parentchain = { path = "../../../../parachain/worker-pallets/parentchain", default-features = false }
pallet-parentchain = { workspace = true }

[dev-dependencies]
sp-keyring = { workspace = true }
Expand All @@ -46,32 +46,27 @@ sgx = [
"itp-sgx-externalities/sgx",
"sp-io/sgx",
"itp-node-api/sgx",
# litentry
"litentry-primitives/sgx",
]
std = [
# crates.io
"codec/std",
"log/std",
# local
"ita-sgx-runtime/std",
"itp-hashing/std",
"itp-sgx-externalities/std",
"itp-stf-interface/std",
"itp-storage/std",
"itp-types/std",
"itp-node-api/std",
# substrate
"sp-core/std",
"pallet-balances/std",
"pallet-sudo/std",
"frame-system/std",
"frame-support/std",
"sp-runtime/std",
# scs/integritee
"pallet-parentchain/std",
"sp-io/std",
# litentry
"litentry-primitives/std",
]
test = []
Expand Down
36 changes: 36 additions & 0 deletions tee-worker/common/litentry/pallets/parentchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[package]
name = "pallet-parentchain"
description = "The pallet to sync and store some parentchain state"
version = "0.1.0"
authors = ['Trust Computing GmbH <[email protected]>', 'Integritee AG <[email protected]>']
homepage = 'https://litentry.com/'
repository = 'https://github.com/litentry/litentry-parachain'
license = "Apache-2.0"
edition = "2021"

[dependencies]
codec = { package = "parity-scale-codec", workspace = true }
scale-info = { workspace = true }

frame-support = { workspace = true }
frame-system = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }

[dev-dependencies]
env_logger = { workspace = true }
sp-keyring = { workspace = true }
pallet-balances = { workspace = true, features = ["std"] }

[features]
default = ["std"]
std = [
"codec/std",
"scale-info/std",
"frame-support/std",
"frame-system/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
]
0 ...ain/worker-pallets/parentchain/src/lib.rs → ...n/litentry/pallets/parentchain/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 ...in/worker-pallets/parentchain/src/mock.rs → .../litentry/pallets/parentchain/src/mock.rs
View file
Open in desktop
File renamed without changes.
0 ...n/worker-pallets/parentchain/src/tests.rs → ...litentry/pallets/parentchain/src/tests.rs
View file
Open in desktop
File renamed without changes.
0 ...worker-pallets/parentchain/src/weights.rs → ...tentry/pallets/parentchain/src/weights.rs
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions tee-worker/identity/app-libs/sgx-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }
sp-version = { workspace = true }

# TODO - move to tee-worker pallets
pallet-evm = { git = "https://github.com/integritee-network/frontier", branch = "bar/polkadot-v0.9.42", default-features = false, optional = true }
pallet-identity-management-tee = { workspace = true }
pallet-parentchain = { package = "pallet-parentchain", path = "../../../../parachain/worker-pallets/parentchain", default-features = false }
pallet-parentchain = { workspace = true }

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions tee-worker/identity/app-libs/stf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ sp-std = { workspace = true }
itp-node-api-metadata-provider = { workspace = true }
lc-stf-task-sender = { path = "../../litentry/core/stf-task/sender", default-features = false }
litentry-hex-utils = { workspace = true }
litentry-macros = { path = "../../../../common/primitives/core/macros", default-features = false }
litentry-macros = { workspace = true }
litentry-primitives = { workspace = true }
pallet-parentchain = { path = "../../../../parachain/worker-pallets/parentchain", default-features = false }
pallet-parentchain = { workspace = true }

[dev-dependencies]
sp-keyring = { workspace = true }
Expand Down
Loading