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

Add back bitacross-worker for paseo #3209

Merged
merged 1 commit into from
Dec 17, 2024
Merged

Add back bitacross-worker for paseo #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions common/primitives/core/src/teebag/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pub enum AttestationType {
pub enum WorkerType {
#[default]
Identity,
BitAcross,
OmniExecutor,
}

Expand Down
17 changes: 17 additions & 0 deletions parachain/Cargo.lock
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resolver = "2"
members = [
'node',
'pallets/account-fix',
'pallets/bitacross',
'pallets/bridge/assets-handler',
'pallets/bridge/chain-bridge',
'pallets/bridge/bridge-transfer',
Expand Down Expand Up @@ -273,6 +274,7 @@ paseo-parachain-runtime = { path = "runtime/paseo", default-features = false }
pallet-account-fix = { path = "pallets/account-fix", default-features = false }
pallet-asset-manager = { path = "pallets/xcm-asset-manager", default-features = false }
pallet-assets-handler = { path = "pallets/bridge/assets-handler", default-features = false }
pallet-bitacross = { path = "pallets/bitacross", default-features = false }
pallet-chain-bridge = { path = "pallets/bridge/chain-bridge", default-features = false }
pallet-bridge-common = { path = "pallets/bridge/common", default-features = false }
pallet-bridge-transfer = { path = "pallets/bridge/bridge-transfer", default-features = false }
Expand Down
3 changes: 2 additions & 1 deletion parachain/node/src/chain_specs/paseo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use super::*;
use core_primitives::PASEO_PARA_ID;
use cumulus_primitives_core::ParaId;
use paseo_parachain_runtime::{
AccountId, AuraId, Balance, BalancesConfig, CouncilMembershipConfig,
AccountId, AuraId, Balance, BalancesConfig, BitacrossConfig, CouncilMembershipConfig,
DeveloperCommitteeMembershipConfig, ParachainInfoConfig, ParachainStakingConfig,
PolkadotXcmConfig, RuntimeGenesisConfig, SessionConfig, SudoConfig,
TechnicalCommitteeMembershipConfig, TeebagConfig, TeebagOperationalMode, VCManagementConfig,
Expand Down Expand Up @@ -227,6 +227,7 @@ fn generate_genesis(
admin: Some(root_key.clone()),
mode: TeebagOperationalMode::Development,
},
bitacross: BitacrossConfig { admin: Some(root_key) },
score_staking: Default::default(),
};

Expand Down
4 changes: 4 additions & 0 deletions parachain/runtime/paseo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ pallet-account-fix = { workspace = true }
pallet-asset-manager = { workspace = true }
pallet-assets = { workspace = true }
pallet-assets-handler = { workspace = true }
pallet-bitacross = { workspace = true }
pallet-bridge-transfer = { workspace = true }
pallet-chain-bridge = { workspace = true }
pallet-evm-assertions = { workspace = true }
Expand Down Expand Up @@ -165,6 +166,7 @@ runtime-benchmarks = [
"pallet-asset-manager/runtime-benchmarks",
"pallet-assets-handler/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-bitacross/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-bounties/runtime-benchmarks",
"pallet-bridge-transfer/runtime-benchmarks",
Expand Down Expand Up @@ -252,6 +254,7 @@ std = [
"pallet-aura/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-bitacross/std",
"pallet-bounties/std",
"pallet-bridge-transfer/std",
"pallet-chain-bridge/std",
Expand Down Expand Up @@ -358,6 +361,7 @@ try-runtime = [
"pallet-aura/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-bitacross/try-runtime",
"pallet-bounties/try-runtime",
"pallet-bridge-transfer/try-runtime",
"pallet-chain-bridge/try-runtime",
Expand Down
10 changes: 9 additions & 1 deletion parachain/runtime/paseo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("paseo-parachain"),
authoring_version: 1,
// same versioning-mechanism as polkadot: use last digit for minor updates
spec_version: 9220,
spec_version: 9221,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -1167,6 +1167,12 @@ impl pallet_omni_account::Config for Runtime {
type OmniAccountConverter = DefaultOmniAccountConverter;
}

impl pallet_bitacross::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type TEECallOrigin = EnsureEnclaveSigner<Runtime>;
type SetAdminOrigin = EnsureRootOrAllCouncil;
}

impl pallet_evm_assertions::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type AssertionId = H160;
Expand Down Expand Up @@ -1368,6 +1374,7 @@ construct_runtime! {
VCManagement: pallet_vc_management = 66,
IMPExtrinsicWhitelist: pallet_group::<Instance1> = 67,
VCMPExtrinsicWhitelist: pallet_group::<Instance2> = 68,
Bitacross: pallet_bitacross = 70,
EvmAssertions: pallet_evm_assertions = 71,

// Developer council
Expand Down Expand Up @@ -1497,6 +1504,7 @@ impl Contains<RuntimeCall> for NormalModeFilter {
// AccountFix
RuntimeCall::AccountFix(_) |
RuntimeCall::AssetsHandler(_) |
RuntimeCall::Bitacross(_) |
RuntimeCall::EvmAssertions(_) |
RuntimeCall::ScoreStaking(_) |
RuntimeCall::OmniAccount(_) |
Expand Down
Loading