Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

include livingassets-ownership pallet #61

Merged
asiniscalchi merged 4 commits into from
Jul 14, 2023
Merged

include livingassets-ownership pallet #61

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78b2c5c
include livingassets-ownership pallet
asiniscalchi Jul 14, 2023
0d7e0ed
Merge branch 'dev' into feature/import_laos_ownership_pallet
asiniscalchi Jul 14, 2023
087de50
rename livingassets -> living-assets
asiniscalchi Jul 14, 2023
485b931
fix after renaming
asiniscalchi Jul 14, 2023
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
Prev Previous commit
fix after renaming
  • Loading branch information
@asiniscalchi
asiniscalchi committed Jul 14, 2023
commit 485b93132a2b70bf1d5468ff71762fe3b29981be
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

9 changes: 4 additions & 5 deletions runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }

pallet-livingassets-ownership = { version = "0.0.1", default-features = false, path = "../pallets/livingassets-ownership" }
pallet-living-assets-ownership = { version = "0.0.1", default-features = false, path = "../pallets/livingassets-ownership" }

# Polkadot
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.43" }
Expand Down Expand Up @@ -114,7 +114,7 @@ std = [
"pallet-collator-selection/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-livingassets-ownership/std",
"pallet-living-assets-ownership/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
Expand Down Expand Up @@ -163,7 +163,7 @@ runtime-benchmarks = [
"frame-system/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-livingassets-ownership/runtime-benchmarks",
"pallet-living-assets-ownership/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
Expand Down Expand Up @@ -195,7 +195,7 @@ try-runtime = [
"pallet-collator-selection/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-livingassets-ownership/try-runtime",
"pallet-living-assets-ownership/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-xcm/try-runtime",
Expand All @@ -209,4 +209,3 @@ try-runtime = [
"polkadot-runtime-common/try-runtime",
"sp-runtime/try-runtime",
]

6 changes: 3 additions & 3 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ mod precompiles;
use precompiles::FrontierPrecompiles;

/// Import the template pallet.
pub use pallet_livingassets_ownership;
pub use pallet_living_assets_ownership;

/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
pub type Signature = MultiSignature;
Expand Down Expand Up @@ -501,7 +501,7 @@ impl pallet_collator_selection::Config for Runtime {
type WeightInfo = ();
}

impl pallet_livingassets_ownership::Config for Runtime {
impl pallet_living_assets_ownership::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
}

Expand Down Expand Up @@ -688,7 +688,7 @@ construct_runtime!(

// Template
Sudo: pallet_sudo = 40,
LivingassetsOwnership: pallet_livingassets_ownership = 41,
LivingassetsOwnership: pallet_living_assets_ownership = 41,

// Frontier
Ethereum: pallet_ethereum = 50,
Expand Down