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
19[dependencies]19[dependencies]
20ink_core = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_core", default-features = false }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 }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 }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 = "nft_rc3", package = "pallet-indices", 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 = "nft_rc3", package = "sp-core", 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 = "nft_rc3", package = "sp-io", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }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 = "nft_rc3", package = "sp-runtime", default-features = false }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"] }27scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
2828
29[dependencies.type-metadata]29[dependencies.type-metadata]
modifiedsmart_contract/ink-types-node-runtime/calls/Cargo.tomldiffbeforeafterboth
12ink_prelude = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_prelude", default-features = false }12ink_prelude = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_prelude", default-features = false }
1313
14scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }14scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
15sp-keyring = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-keyring", optional = true }15sp-keyring = { git = "https://github.com/usetech-llc/substrate/", branch = "rc4_ext_dispatch_reenabled", package = "sp-keyring", optional = true }
16ink_types_node_runtime = { path = "../", default-features = false }16ink_types_node_runtime = { path = "../", default-features = false }
1717
18[dependencies.type-metadata]18[dependencies.type-metadata]