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

update(code): peaq-polkadot-v0.9.38 #277

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

update(code): peaq-polkadot-v0.9.38 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92d0965
update(code): peaq-polkadot-v0.9.38
Oct 4, 2023
48c116f
update(code): toolchain channel change and peaqnetwork github repo ch…
Oct 6, 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
2,074 changes: 1,578 additions & 496 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ the following:
### Pallets

The runtime in this project is constructed using many FRAME pallets that ship with the
[core Substrate repository](https://github.com/paritytech/substrate/tree/master/frame) and a
[core Substrate repository](https://github.com/peaqnetwork/substrate.git/tree/master/frame) and a
template pallet that is [defined in the `pallets`](./pallets/template/src/lib.rs) directory.

A FRAME pallet is compromised of a number of blockchain primitives:
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

## Overview

Initial implementation extends [Substrate Uniques](https://github.com/paritytech/substrate/tree/master/frame/uniques) pallet as 'low level' NFT dependency.
Initial implementation extends [Substrate Uniques](https://github.com/peaqnetwork/substrate.git/tree/master/frame/uniques) pallet as 'low level' NFT dependency.
Mechanics and interactions are based on [RMRK 2 standard](https://github.com/rmrk-team/rmrk-spec/tree/master/standards/rmrk2.0.0)

![](https://camo.githubusercontent.com/1202d3852b7eba4ae73a6e90021e2006984e349f392665c34897fda846fe5b57/68747470733a2f2f7374617469632e7377696d6c616e65732e696f2f36383731663161343233386533663637363265623738343132663062383363322e706e67)
Expand Down
70 changes: 35 additions & 35 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,46 +17,46 @@ name = "rmrk-substrate"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
clap = { version = "4.0.9", features = ["derive"] }
clap = { version = "4.0.32", features = ["derive"] }
futures = { version = "0.3.21", features = ["thread-pool"]}

sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-core = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-keystore = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-finality-grandpa = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-finality-grandpa = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-runtime = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-io = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-inherents = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-keyring = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-cli = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-core = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-executor = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-service = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-telemetry = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-keystore = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-transaction-pool = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-transaction-pool-api = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-consensus-aura = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-consensus-aura = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-consensus = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-consensus = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-finality-grandpa = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-finality-grandpa = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-client-api = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-runtime = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-io = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-timestamp = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-inherents = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-keyring = { version = "7.0.0", git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
frame-system = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
pallet-transaction-payment = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

# These dependencies are used for the node template"s RPCs
jsonrpsee = { version = "0.16.2", features = ["server"] }
sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sc-rpc = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-api = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-rpc-api = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-blockchain = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-block-builder = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sc-basic-authorship = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
substrate-frame-rpc-system = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
pallet-transaction-payment-rpc = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

# These dependencies are used for runtime benchmarking
frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-benchmarking = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
frame-benchmarking-cli = { git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

# Local Dependencies
rmrk-substrate-runtime = { version = "4.0.0-dev", path = "../runtime" }
Expand All @@ -67,10 +67,10 @@ pallet-rmrk-core = { version = "0.0.1", path = "../pallets/rmrk-core" }
pallet-rmrk-equip = { version = "0.0.1", path = "../pallets/rmrk-equip" }

# CLI-specific dependencies
try-runtime-cli = { version = "0.10.0-dev", optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
try-runtime-cli = { optional = true, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

[build-dependencies]
substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

[features]
default = []
Expand Down
28 changes: 14 additions & 14 deletions pallets/rmrk-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@ repository = "https://github.com/rmrk-team/rmrk-substrate"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { version = "1.0.111", default-features = false, features = ["derive"] }
sp-runtime = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-std = { default-features = false, version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
serde = { version = "1.0.151", default-features = false, features = ["derive"] }
sp-runtime = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
"derive",
] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
frame-support = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-system = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-benchmarking = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", optional = true, branch = "polkadot-v0.9.36" }
scale-info = { version = "2.1", default-features = false, features = ["derive"] }
frame-support = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
frame-system = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
frame-benchmarking = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", optional = true, branch = "peaq-polkadot-v0.9.38" }

pallet-uniques = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
pallet-balances = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
pallet-uniques = { default-features = false, version = "4.0.0-dev", git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
pallet-balances = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }


# Local Dependencies
rmrk-traits = { default-features = false, version = "0.0.1", path = "../../traits" }

[dev-dependencies]
sp-core = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-io = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-runtime = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-std = { default-features = false, version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-core = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-io = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-runtime = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

[features]
default = ["std"]
Expand Down
28 changes: 14 additions & 14 deletions pallets/rmrk-equip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@ repository = "https://github.com/rmrk-team/rmrk-substrate"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { version = "1.0.111", default-features = false, features = ["derive"] }
sp-runtime = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-std = { default-features = false, version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
serde = { version = "1.0.151", default-features = false, features = ["derive"] }
sp-runtime = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
"derive",
] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
frame-support = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-system = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
frame-benchmarking = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", optional = true, branch = "polkadot-v0.9.36" }
scale-info = { version = "2.1", default-features = false, features = ["derive"] }
frame-support = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
frame-system = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
frame-benchmarking = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", optional = true, branch = "peaq-polkadot-v0.9.38" }

pallet-uniques = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
pallet-balances = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
pallet-uniques = { default-features = false, version = "4.0.0-dev", git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
pallet-balances = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

# Local Dependencies
pallet-rmrk-core = { default-features = false, version = "0.0.1", path = "../rmrk-core" }
rmrk-traits = { default-features = false, version = "0.0.1", path = "../../traits" }


[dev-dependencies]
sp-core = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-io = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-runtime = { default-features = false, version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-std = { default-features = false, version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" }
sp-core = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-io = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-runtime = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }
sp-std = { default-features = false, git = "https://github.com/peaqnetwork/substrate.git", branch = "peaq-polkadot-v0.9.38" }

[features]
default = ["std"]
Expand Down
Loading