git.delta.rocks / unique-network / refs/commits / 47316c5c4054

difftreelog

Merge branch 'master' of https://github.com/usetech-llc/nft_parachain

str-mv2020-07-23parents: #abb3f22 #31df977.patch.diff
in: master

2 files changed

modifiedsmart_contract/ink-types-node-runtime/Cargo.tomldiffbeforeafterboth
before · smart_contract/ink-types-node-runtime/Cargo.toml
1[package]2name = "ink_types_node_runtime"3version = "0.1.0"4authors = ["Parity Technologies <admin@parity.io>"]5edition = "2018"67license = "GPL-3.0"8readme = "README.md"910repository = "https://github.com/usetech-llc/ink"11homepage = "https://www.parity.io/"1213description = "[ink!] Rust based eDSL for writing smart contracts for Substrate"14keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]15categories = ["no-std", "embedded"]1617include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]1819[dependencies]20ink_core = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_core", default-features = false }21ink_prelude = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_prelude", default-features = false }22frame-system = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "frame-system", default-features = false }23pallet-indices = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "pallet-indices", default-features = false }24sp-core = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-core", default-features = false }25sp-io = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-io", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }26sp-runtime = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-runtime", default-features = false }27scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }2829[dependencies.type-metadata]30git = "https://github.com/type-metadata/type-metadata.git"31rev = "02eae9f35c40c943b56af5b60616219f2b72b47d"32default-features = false33features = ["derive"]34optional = true353637[dev-dependencies]38node-runtime = { git = "https://github.com/usetech-llc/nft_parachain/", package = "nft", features = ["std"] }3940[features]41default = ["std"]42std = [43    "ink_core/std",44    "frame-system/std",45    "pallet-indices/std",46    "sp-core/std",47    "sp-io/std",48    "sp-runtime/std",49]50ink-generate-abi = [51    "std",52    "type-metadata",53    "ink_core/ink-generate-abi",54]
after · smart_contract/ink-types-node-runtime/Cargo.toml
1[package]2name = "ink_types_node_runtime"3version = "0.1.0"4authors = ["Parity Technologies <admin@parity.io>"]5edition = "2018"67license = "GPL-3.0"8readme = "README.md"910repository = "https://github.com/usetech-llc/ink"11homepage = "https://www.parity.io/"1213description = "[ink!] Rust based eDSL for writing smart contracts for Substrate"14keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]15categories = ["no-std", "embedded"]1617include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]1819[dependencies]20ink_core = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_core", default-features = false }21ink_prelude = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_prelude", default-features = false }22frame-system = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "frame-system", default-features = false }23pallet-indices = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "pallet-indices", default-features = false }24sp-core = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "sp-core", default-features = false }25sp-io = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "sp-io", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }26sp-runtime = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "sp-runtime", default-features = false }27scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }2829[dependencies.type-metadata]30git = "https://github.com/type-metadata/type-metadata.git"31rev = "02eae9f35c40c943b56af5b60616219f2b72b47d"32default-features = false33features = ["derive"]34optional = true353637[dev-dependencies]38node-runtime = { git = "https://github.com/usetech-llc/nft_parachain/", package = "nft", features = ["std"] }3940[features]41default = ["std"]42std = [43    "ink_core/std",44    "frame-system/std",45    "pallet-indices/std",46    "sp-core/std",47    "sp-io/std",48    "sp-runtime/std",49]50ink-generate-abi = [51    "std",52    "type-metadata",53    "ink_core/ink-generate-abi",54]
modifiedsmart_contract/ink-types-node-runtime/calls/Cargo.tomldiffbeforeafterboth
--- a/smart_contract/ink-types-node-runtime/calls/Cargo.toml
+++ b/smart_contract/ink-types-node-runtime/calls/Cargo.toml
@@ -12,7 +12,7 @@
 ink_prelude = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_prelude", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
-sp-keyring = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-keyring", optional = true }
+sp-keyring = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "sp-keyring", optional = true }
 ink_types_node_runtime = { path = "../", default-features = false }
 
 [dependencies.type-metadata]