Skip to content

Commit

Permalink
Merge pull request #4 from r0gue-io/al3mart/chore-polkadot-v1.10.0
Browse files Browse the repository at this point in the history 
chore(ap): Bump assets parachain to `polkadot-v1.10.0`
  • Loading branch information
@al3mart
al3mart authored Jun 11, 2024
2 parents 13ed03f + 106774c commit 0853e4d
Show file tree
Hide file tree
Showing 13 changed files with 1,732 additions and 1,599 deletions.
1,348 changes: 673 additions & 675 deletions Cargo.lock
View file

Large diffs are not rendered by default.

181 changes: 90 additions & 91 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,112 +16,111 @@ members = [
resolver = "2"

[workspace.dependencies]
clap = { version = "4.5.3", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
color-print = "0.3.4"
futures = "0.3.30"
hex-literal = "0.4.1"
jsonrpsee = { version = "0.22", features = ["server"] }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
smallvec = "1.11.2"
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
serde = "1.0.197"
clap = { version = "4.5.1", features = ["derive"] }
jsonrpsee = { version = "0.22", features = ["server"] }
futures = "0.3.30"
serde_json = "1.0.114"

smallvec = "1.11.2"

# Build
substrate-wasm-builder = "20.0.0"
substrate-build-script-utils = "11.0.0"
substrate-wasm-builder = "21.0.0"

# Local
parachain-template-runtime = { path = "./runtime" }

# Substrate
sc-basic-authorship = "0.37.0"
sc-chain-spec = "30.0.1"
sc-cli = "0.39.0"
sc-client-api = "31.0.0"
sc-offchain = "32.0.0"
sc-consensus = "0.36.0"
sc-executor = "0.35.0"
sc-network = "0.37.0"
sc-network-sync = "0.36.0"
sc-rpc = "32.0.0"
sc-service = "0.38.0"
sc-sysinfo = "30.0.0"
sc-telemetry = "17.0.0"
sc-tracing = "31.0.0"
sc-transaction-pool = "31.0.0"
sc-transaction-pool-api = "31.0.0"
frame-benchmarking = { version = "31.0.0", default-features = false }
frame-benchmarking-cli = "35.0.1"
frame-executive = { version = "31.0.0", default-features = false }
frame-support = { version = "31.0.0", default-features = false }
frame-system = { version = "31.0.0", default-features = false }
frame-system-benchmarking = { version = "31.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "29.0.0", default-features = false }
frame-try-runtime = { version = "0.37.0", default-features = false }
pallet-assets = { version = "32.0.0", default-features = false }
pallet-aura = { version = "30.0.0", default-features = false }
pallet-authorship = { version = "31.0.0", default-features = false }
pallet-balances = { version = "31.0.0", default-features = false }
pallet-message-queue = { version = "34.0.0", default-features = false }
pallet-nfts = { version = "25.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "17.0.0", default-features = false }
pallet-nft-fractionalization = { version = "13.0.0", default-features = false }
pallet-session = { version = "31.0.0", default-features = false }
pallet-sudo = { version = "31.0.0", default-features = false }
pallet-timestamp = { version = "30.0.0", default-features = false }
pallet-transaction-payment = { version = "31.0.0", default-features = false }
pallet-transaction-payment-rpc = "33.0.0"
pallet-transaction-payment-rpc-runtime-api = { version = "31.0.0", default-features = false }
sp-api = { version = "29.0.0", default-features = false }
sp-block-builder = { version = "29.0.0", default-features = false }
sp-blockchain = "31.0.0"
sp-consensus-aura = { version = "0.35.0", default-features = false }
sp-core = { version = "31.0.0", default-features = false }
sp-keystore = "0.37.0"
sp-io = { version = "33.0.0", default-features = false }
sp-genesis-builder = { version = "0.10.0", default-features = false }
sp-inherents = { version = "29.0.0", default-features = false }
sp-offchain = { version = "29.0.0", default-features = false }
sp-runtime = { version = "34.0.0", default-features = false }
sp-timestamp = "29.0.0"
substrate-frame-rpc-system = "31.0.0"
substrate-prometheus-endpoint = "0.17.0"
sp-session = { version = "30.0.0", default-features = false }
frame-benchmarking = { version = "32.0.0", default-features = false }
frame-benchmarking-cli = "36.0.0"
frame-executive = { version = "32.0.0", default-features = false }
frame-support = { version = "32.0.0", default-features = false }
frame-system = { version = "32.0.0", default-features = false }
frame-system-benchmarking = { version = "32.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "30.0.0", default-features = false }
frame-try-runtime = { version = "0.38.0", default-features = false }
pallet-assets = { version = "33.0.0", default-features = false }
pallet-aura = { version = "31.0.0", default-features = false }
pallet-authorship = { version = "32.0.0", default-features = false }
pallet-balances = { version = "33.0.0", default-features = false }
pallet-message-queue = { version = "35.0.0", default-features = false }
pallet-nfts = { version = "26.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "18.0.0", default-features = false }
pallet-nft-fractionalization = { version = "14.0.0", default-features = false }
pallet-session = { version = "32.0.0", default-features = false }
pallet-sudo = { version = "32.0.0", default-features = false }
pallet-timestamp = { version = "31.0.0", default-features = false }
pallet-transaction-payment = { version = "32.0.0", default-features = false }
pallet-transaction-payment-rpc = "34.0.0"
pallet-transaction-payment-rpc-runtime-api = { version = "32.0.0", default-features = false }
sc-basic-authorship = "0.38.0"
sc-chain-spec = "31.0.0"
sc-cli = "0.40.0"
sc-client-api = "32.0.0"
sc-offchain = "33.0.0"
sc-consensus = "0.37.0"
sc-executor = "0.36.0"
sc-network = "0.38.0"
sc-network-sync = "0.37.0"
sc-rpc = "33.0.0"
sc-service = "0.39.0"
sc-sysinfo = "31.0.0"
sc-telemetry = "18.0.0"
sc-tracing = "32.0.0"
sc-transaction-pool = "32.0.0"
sc-transaction-pool-api = "32.0.0"
sp-api = { version = "30.0.0", default-features = false }
sp-block-builder = { version = "30.0.0", default-features = false }
sp-blockchain = "32.0.0"
sp-consensus-aura = { version = "0.36.0", default-features = false }
sp-core = { version = "32.0.0", default-features = false }
sp-io = { version = "34.0.0", default-features = false }
sp-genesis-builder = { version = "0.11.0", default-features = false }
sp-inherents = { version = "30.0.0", default-features = false }
sp-keystore = "0.38.0"
sp-offchain = { version = "30.0.0", default-features = false }
sp-runtime = { version = "35.0.0", default-features = false }
sp-session = { version = "31.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-transaction-pool = { version = "29.0.0", default-features = false }
sp-version = { version = "32.0.0", default-features = false }
sp-timestamp = "30.0.0"
sp-transaction-pool = { version = "30.0.0", default-features = false }
sp-version = { version = "33.0.0", default-features = false }
substrate-frame-rpc-system = "32.0.0"
substrate-prometheus-endpoint = "0.17.0"

# Polkadot
pallet-xcm = { version = "10.0.1", default-features = false }
polkadot-cli = "10.0.0"
polkadot-parachain-primitives = { version = "9.0.0", default-features = false }
polkadot-primitives = "10.0.0"
xcm = { version = "10.0.0", package = "staging-xcm", default-features = false }
polkadot-runtime-common = { version = "10.0.0", default-features = false }
xcm-builder = { version = "10.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "10.0.0", package = "staging-xcm-executor", default-features = false }
pallet-xcm = { version = "11.0.0", default-features = false }
polkadot-cli = "11.0.0"
polkadot-parachain-primitives = { version = "10.0.0", default-features = false }
polkadot-primitives = "11.0.0"
polkadot-runtime-common = { version = "11.0.0", default-features = false }
xcm = { version = "11.0.0", package = "staging-xcm", default-features = false }
xcm-builder = { version = "11.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "11.0.0", package = "staging-xcm-executor", default-features = false }

# Cumulus
cumulus-pallet-aura-ext = { version = "0.10.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.10.0", default-features = false, features = ["parameterized-consensus-hook"] }
cumulus-pallet-session-benchmarking = { version = "12.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.10.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.10.0", default-features = false }
cumulus-primitives-aura = { version = "0.10.0", default-features = false }
cumulus-primitives-core = { version = "0.10.0", default-features = false }
cumulus-primitives-utility = { version = "0.10.0", default-features = false }
cumulus-primitives-storage-weight-reclaim = { version = "1.0.0", default-features = false }
pallet-collator-selection = { version = "12.0.1", default-features = false }
parachains-common = { version = "10.0.0", default-features = false }
parachain-info = { version = "0.10.0", package = "staging-parachain-info", default-features = false }
cumulus-primitives-parachain-inherent = "0.10.0"
cumulus-relay-chain-interface = "0.10.0"
color-print = "0.3.4"
cumulus-client-cli = "0.10.0"
cumulus-client-collator = "0.10.0"
cumulus-client-consensus-aura = "0.10.0"
cumulus-client-consensus-common = "0.10.0"
cumulus-client-consensus-proposer = "0.10.0"
cumulus-client-service = "0.10.0"
cumulus-client-cli = "0.11.0"
cumulus-client-collator = "0.11.0"
cumulus-client-consensus-aura = "0.11.0"
cumulus-client-consensus-common = "0.11.0"
cumulus-client-consensus-proposer = "0.11.0"
cumulus-client-service = "0.11.0"
cumulus-pallet-aura-ext = { version = "0.11.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.11.0", default-features = false, features = ["parameterized-consensus-hook"] }
cumulus-pallet-session-benchmarking = { version = "13.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.11.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.11.0", default-features = false }
cumulus-primitives-aura = { version = "0.11.0", default-features = false }
cumulus-primitives-core = { version = "0.11.0", default-features = false }
cumulus-primitives-parachain-inherent = "0.11.0"
cumulus-primitives-storage-weight-reclaim = { version = "2.0.0", default-features = false }
cumulus-primitives-utility = { version = "0.11.0", default-features = false }
cumulus-relay-chain-interface = "0.11.0"
pallet-collator-selection = { version = "13.0.1", default-features = false }
parachains-common = { version = "11.0.0", default-features = false }
parachain-info = { version = "0.11.0", package = "staging-parachain-info", default-features = false }
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A new [Cumulus](https://github.com/paritytech/polkadot-sdk/tree/master/cumulus)-based Substrate node, configured with fungible and non-fungilble asset functionalities, including asset fractionalization.

This project is a fork of the [Base Parachain Template](https://github.com/r0gue-io/base-parachain).
This project is a fork of the [Base Parachain Template](https://github.com/r0gue-io/base-parachain).

It is used to generate parachains using [Pop CLI](https://github.com/r0gue-io/pop-cli), an all-in-one tool for Polkadot development.

Expand Down
110 changes: 55 additions & 55 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,73 +7,73 @@ license.workspace = true
homepage.workspace = true
repository.workspace = true
edition.workspace = true
publish = false

build = "build.rs"
publish = false

[build-dependencies]
substrate-build-script-utils.workspace = true

[dependencies]
clap = { workspace = true }
log = { workspace = true }
codec = { workspace = true }
serde = { workspace = true }
jsonrpsee = { workspace = true }
futures = { workspace = true }
serde_json = { workspace = true }
clap.workspace = true
codec.workspace = true
color-print.workspace = true
futures.workspace = true
jsonrpsee.workspace = true
log.workspace = true
serde.workspace = true
serde_json.workspace = true

# Local
parachain-template-runtime = { workspace = true }
parachain-template-runtime.workspace = true

# Substrate
frame-benchmarking = { workspace = true }
frame-benchmarking-cli = { workspace = true }
pallet-transaction-payment-rpc = { workspace = true }
sc-basic-authorship = { workspace = true }
sc-chain-spec = { workspace = true }
sc-cli = { workspace = true }
sc-client-api = { workspace = true }
sc-offchain = { workspace = true }
sc-consensus = { workspace = true }
sc-executor = { workspace = true }
sc-network = { workspace = true }
sc-network-sync = { workspace = true }
sc-rpc = { workspace = true }
sc-service = { workspace = true }
sc-sysinfo = { workspace = true }
sc-telemetry = { workspace = true }
sc-tracing = { workspace = true }
sc-transaction-pool = { workspace = true }
sc-transaction-pool-api = { workspace = true }
sp-api = { workspace = true }
sp-block-builder = { workspace = true }
sp-blockchain = { workspace = true }
sp-consensus-aura = { workspace = true }
sp-core = { workspace = true }
sp-keystore = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-timestamp = { workspace = true }
substrate-frame-rpc-system = { workspace = true }
substrate-prometheus-endpoint = { workspace = true }
frame-benchmarking.workspace = true
frame-benchmarking-cli.workspace = true
pallet-transaction-payment-rpc.workspace = true
sc-basic-authorship.workspace = true
sc-chain-spec.workspace = true
sc-cli.workspace = true
sc-client-api.workspace = true
sc-consensus.workspace = true
sc-executor.workspace = true
sc-network.workspace = true
sc-network-sync.workspace = true
sc-offchain.workspace = true
sc-rpc.workspace = true
sc-service.workspace = true
sc-sysinfo.workspace = true
sc-telemetry.workspace = true
sc-tracing.workspace = true
sc-transaction-pool.workspace = true
sc-transaction-pool-api.workspace = true
sp-api.workspace = true
sp-block-builder.workspace = true
sp-blockchain.workspace = true
sp-consensus-aura.workspace = true
sp-core.workspace = true
sp-keystore.workspace = true
sp-io.workspace = true
sp-runtime.workspace = true
sp-timestamp.workspace = true
substrate-frame-rpc-system.workspace = true
substrate-prometheus-endpoint.workspace = true

# Polkadot
polkadot-cli = { workspace = true }
polkadot-primitives = { workspace = true }
xcm = { workspace = true }
polkadot-cli.workspace = true
polkadot-primitives.workspace = true
xcm.workspace = true

# Cumulus
cumulus-client-cli = { workspace = true }
cumulus-client-collator = { workspace = true }
cumulus-client-consensus-aura = { workspace = true }
cumulus-client-consensus-common = { workspace = true }
cumulus-client-consensus-proposer = { workspace = true }
cumulus-client-service = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-parachain-inherent = { workspace = true }
cumulus-relay-chain-interface = { workspace = true }
color-print = { workspace = true }

[build-dependencies]
substrate-build-script-utils = { workspace = true }
cumulus-client-cli.workspace = true
cumulus-client-collator.workspace = true
cumulus-client-consensus-aura.workspace = true
cumulus-client-consensus-common.workspace = true
cumulus-client-consensus-proposer.workspace = true
cumulus-client-service.workspace = true
cumulus-primitives-core.workspace = true
cumulus-primitives-parachain-inherent.workspace = true
cumulus-relay-chain-interface.workspace = true

[features]
default = []
Expand Down
8 changes: 4 additions & 4 deletions node/src/chain_spec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn development_config() -> ChainSpec {
Extensions {
relay_chain: "rococo-local".into(),
// You MUST set this to the correct network!
para_id: 1000,
para_id: 2000,
},
)
.with_name("Development")
Expand Down Expand Up @@ -106,7 +106,7 @@ pub fn development_config() -> ChainSpec {
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
],
get_account_id_from_seed::<sr25519::Public>("Alice"),
1000.into(),
2000.into(),
))
.build()
}
Expand All @@ -124,7 +124,7 @@ pub fn local_testnet_config() -> ChainSpec {
Extensions {
relay_chain: "rococo-local".into(),
// You MUST set this to the correct network!
para_id: 1000,
para_id: 2000,
},
)
.with_name("Local Testnet")
Expand Down Expand Up @@ -157,7 +157,7 @@ pub fn local_testnet_config() -> ChainSpec {
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
],
get_account_id_from_seed::<sr25519::Public>("Alice"),
1000.into(),
2000.into(),
))
.with_protocol_id("template-local")
.with_properties(properties)
Expand Down
5 changes: 2 additions & 3 deletions node/src/command.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,11 @@ pub fn run() -> Result<()> {
}),
#[cfg(not(feature = "runtime-benchmarks"))]
BenchmarkCmd::Storage(_) =>
return Err(sc_cli::Error::Input(
Err(sc_cli::Error::Input(
"Compile with --features=runtime-benchmarks \
to enable storage benchmarks."
.into(),
)
.into()),
)),
#[cfg(feature = "runtime-benchmarks")]
BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {
let partials = new_partial(&config)?;
Expand Down
Loading

0 comments on commit 0853e4d

Please sign in to comment.