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

Upgrade substrate to commit d2c4b0db #88

Merged
merged 5 commits into from
Nov 12, 2019
Merged

Upgrade substrate to commit d2c4b0db #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40e821f
try to upgrated to commit d2c4b0db
hackfisher Nov 11, 2019
20dea25
Fix compile issues
hackfisher Nov 12, 2019
463a60e
merge develop and resolve conflicts
hackfisher Nov 12, 2019
90ea5c9
anchor substrate dependency version using a forking repository, preve…
hackfisher Nov 12, 2019
6fa5a4a
rename module name, Fixed #63
hackfisher Nov 12, 2019
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
3,314 changes: 1,716 additions & 1,598 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

87 changes: 44 additions & 43 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,51 @@
cli = { package = "node-cli", path = "node/cli" }
futures = "0.1.29"
ctrlc = { version = "3.1.3", features = ["termination"] }
substrate-cli = { git = 'https://github.com/paritytech/substrate.git' }
substrate-client = { git = 'https://github.com/paritytech/substrate.git' }
substrate-client-db = { git = 'https://github.com/paritytech/substrate.git' }
substrate-consensus-aura = { git = 'https://github.com/paritytech/substrate.git' }
substrate-consensus-babe = { git = 'https://github.com/paritytech/substrate.git' }
substrate-consensus-common = { git = 'https://github.com/paritytech/substrate.git' }
substrate-consensus-rhd = { git = 'https://github.com/paritytech/substrate.git' }
substrate-consensus-slots = { git = 'https://github.com/paritytech/substrate.git' }
substrate-executor = { git = 'https://github.com/paritytech/substrate.git' }
substrate-finality-grandpa = { git = 'https://github.com/paritytech/substrate.git' }
substrate-finality-grandpa-primitives = { git = 'https://github.com/paritytech/substrate.git' }
substrate-inherents = { git = 'https://github.com/paritytech/substrate.git' }
substrate-keyring = { git = 'https://github.com/paritytech/substrate.git' }
substrate-keystore = { git = 'https://github.com/paritytech/substrate.git' }
substrate-network = { git = 'https://github.com/paritytech/substrate.git' }
substrate-panic-handler = { git = 'https://github.com/paritytech/substrate.git' }
substrate-primitives = { git = 'https://github.com/paritytech/substrate.git' }
substrate-rpc = { git = 'https://github.com/paritytech/substrate.git' }
substrate-rpc-servers = { git = 'https://github.com/paritytech/substrate.git' }
substrate-serializer = { git = 'https://github.com/paritytech/substrate.git' }
substrate-service = { git = 'https://github.com/paritytech/substrate.git' }
substrate-service-test = { git = 'https://github.com/paritytech/substrate.git' }
sr-api-macros = { git = 'https://github.com/paritytech/substrate.git' }
sr-io = { git = 'https://github.com/paritytech/substrate.git' }
sr-primitives = { git = 'https://github.com/paritytech/substrate.git' }
sr-sandbox = { git = 'https://github.com/paritytech/substrate.git' }
sr-std = { git = 'https://github.com/paritytech/substrate.git' }
sr-version = { git = 'https://github.com/paritytech/substrate.git' }
substrate-state-machine = { git = 'https://github.com/paritytech/substrate.git' }
substrate-telemetry = { git = 'https://github.com/paritytech/substrate.git' }
substrate-transaction-pool = { git = 'https://github.com/paritytech/substrate.git' }
substrate-transaction-graph = { git = 'https://github.com/paritytech/substrate.git' }
substrate-trie = { git = 'https://github.com/paritytech/substrate.git' }
fork-tree = { git = 'https://github.com/paritytech/substrate.git' }
substrate-cli = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-client = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-client-db = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-aura = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-babe = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-common = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-rhd = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-consensus-slots = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-executor = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-finality-grandpa = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-finality-grandpa-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-inherents = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-keyring = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-keystore = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-network = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-panic-handler = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-rpc = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-rpc-servers = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-serializer = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-service = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-service-test = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-api = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-api-proc-macro = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-io = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-sandbox = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-std = { git = 'https://github.com/darwinia-network/substrate.git' }
sr-version = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-state-machine = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-telemetry = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-transaction-pool = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-transaction-graph = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-trie = { git = 'https://github.com/darwinia-network/substrate.git' }
fork-tree = { git = 'https://github.com/darwinia-network/substrate.git' }
#new
substrate-application-crypto = { git = 'https://github.com/paritytech/substrate.git' }
substrate-authority-discovery = { git = 'https://github.com/paritytech/substrate.git' }
substrate-basic-authorship = { git = 'https://github.com/paritytech/substrate.git' }
substrate-externalities = { git = 'https://github.com/paritytech/substrate.git' }
substrate-offchain = { git = 'https://github.com/paritytech/substrate.git' }
substrate-peerset = { git = 'https://github.com/paritytech/substrate.git' }
substrate-phragmen = { git = 'https://github.com/paritytech/substrate.git' }
substrate-session = { git = 'https://github.com/paritytech/substrate.git' }
substrate-wasm-interface = { git = 'https://github.com/paritytech/substrate.git' }
substrate-application-crypto = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-authority-discovery = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-basic-authorship = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-externalities = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-offchain = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-peerset = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-phragmen = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-session = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-wasm-interface = { git = 'https://github.com/darwinia-network/substrate.git' }

[build-dependencies]
vergen = "3.0.4"
Expand Down
4 changes: 2 additions & 2 deletions core/merkle-mountain-range/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ edition = "2018"
[dependencies]
blake2 = { version = "0.8.1", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
rstd = { package = "sr-std", git = 'https://github.com/paritytech/substrate.git', default-features = false }
system = { package = "srml-system", git = 'https://github.com/paritytech/substrate.git', default-features = false }
rstd = { package = "sr-std", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
system = { package = "srml-system", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions core/sr-eth-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ edition = "2018"
[dependencies]
serde = { version = "1.0.101", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
rstd = { package = "sr-std", git = 'https://github.com/paritytech/substrate.git', default-features = false }
sr-primitives = {git = 'https://github.com/paritytech/substrate.git', default-features = false }
substrate-primitives = {git = 'https://github.com/paritytech/substrate.git', default-features = false }
rstd = { package = "sr-std", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
sr-primitives = {git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
substrate-primitives = {git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
rlp = { version = "0.4.3", optional = true }
parity-crypto = { version = "0.4.2", features = ["publickey"] }
rlp_derive = { git = "https://github.com/paritytech/parity-ethereum.git" }
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"

[dev-dependencies]
support = { package = "srml-support", git = 'https://github.com/paritytech/substrate.git'}
support = { package = "srml-support", git = 'https://github.com/darwinia-network/substrate.git'}
rustc-hex = "2.0"

[features]
Expand Down
76 changes: 38 additions & 38 deletions node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,59 @@ log = "0.4.8"
tokio = "0.1.22"
futures = "0.1.29"
exit-future = "0.1.4"
jsonrpc-core = "13.2.0"
cli = { package = "substrate-cli", git = 'https://github.com/paritytech/substrate.git' }
jsonrpc-core = "14.0.3"
cli = { package = "substrate-cli", git = 'https://github.com/darwinia-network/substrate.git' }
codec = { package = "parity-scale-codec", version = "1.0.0" }
sr-io = { git = 'https://github.com/paritytech/substrate.git' }
client = { package = "substrate-client", git = 'https://github.com/paritytech/substrate.git' }
primitives = { package = "substrate-primitives", git = 'https://github.com/paritytech/substrate.git' }
inherents = { package = "substrate-inherents", git = 'https://github.com/paritytech/substrate.git' }
runtime-io = { package = "sr-io", git = 'https://github.com/darwinia-network/substrate.git' }
client = { package = "substrate-client", git = 'https://github.com/darwinia-network/substrate.git' }
primitives = { package = "substrate-primitives", git = 'https://github.com/darwinia-network/substrate.git' }
inherents = { package = "substrate-inherents", git = 'https://github.com/darwinia-network/substrate.git' }
node-runtime = { path = "../runtime" }
node-primitives = { path = "../primitives" }
hex-literal = "0.2.1"
substrate-basic-authorship = { git = 'https://github.com/paritytech/substrate.git' }
substrate-service = { git = 'https://github.com/paritytech/substrate.git' }
transaction_pool = { package = "substrate-transaction-pool", git = 'https://github.com/paritytech/substrate.git' }
network = { package = "substrate-network", git = 'https://github.com/paritytech/substrate.git' }
consensus = { package = "substrate-consensus-aura", git = 'https://github.com/paritytech/substrate.git' }
grandpa = { package = "substrate-finality-grandpa", git = 'https://github.com/paritytech/substrate.git' }
sr-primitives = { git = 'https://github.com/paritytech/substrate.git' }
aura_primitives = { package = "substrate-consensus-aura-primitives", git = 'https://github.com/paritytech/substrate.git' }
substrate-basic-authorship = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-service = { git = 'https://github.com/darwinia-network/substrate.git' }
transaction_pool = { package = "substrate-transaction-pool", git = 'https://github.com/darwinia-network/substrate.git' }
network = { package = "substrate-network", git = 'https://github.com/darwinia-network/substrate.git' }
consensus = { package = "substrate-consensus-aura", git = 'https://github.com/darwinia-network/substrate.git' }
grandpa = { package = "substrate-finality-grandpa", git = 'https://github.com/darwinia-network/substrate.git' }
sr-primitives = { git = 'https://github.com/darwinia-network/substrate.git' }
aura_primitives = { package = "substrate-consensus-aura-primitives", git = 'https://github.com/darwinia-network/substrate.git' }
node-executor = { path = "../executor" }
substrate-keystore = { git = 'https://github.com/paritytech/substrate.git' }
substrate-telemetry = { package = "substrate-telemetry", git = 'https://github.com/paritytech/substrate.git' }
substrate-keystore = { git = 'https://github.com/darwinia-network/substrate.git' }
substrate-telemetry = { package = "substrate-telemetry", git = 'https://github.com/darwinia-network/substrate.git' }
structopt = "0.3.3"
transaction-factory = { git = 'https://github.com/paritytech/substrate.git' }
keyring = { package = "substrate-keyring", git = 'https://github.com/paritytech/substrate.git' }
indices = { package = "srml-indices", git = 'https://github.com/paritytech/substrate.git'}
timestamp = { package = "srml-timestamp", git = 'https://github.com/paritytech/substrate.git', default-features = false }
transaction-factory = { git = 'https://github.com/darwinia-network/substrate.git' }
keyring = { package = "substrate-keyring", git = 'https://github.com/darwinia-network/substrate.git' }
indices = { package = "srml-indices", git = 'https://github.com/darwinia-network/substrate.git'}
timestamp = { package = "srml-timestamp", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
rand = "0.7.2"
finality_tracker = { package = "srml-finality-tracker", git = 'https://github.com/paritytech/substrate.git', default-features = false }
srml-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false }
contracts = { package = "srml-contracts", git = 'https://github.com/paritytech/substrate.git', default-features = false }
finality_tracker = { package = "srml-finality-tracker", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
srml-support = { git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
contracts = { package = "srml-contracts", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
backtrace = "0.3"
reqwest = "0.9.5"
serde = { version = "1.0.101", features = [ "derive" ] }
serde_json = "1.0"
#new
chain-spec = { package = "substrate-chain-spec", git = 'https://github.com/paritytech/substrate.git' }
system = { package = "srml-system", git = 'https://github.com/paritytech/substrate.git' }
transaction-payment = { package = "srml-transaction-payment", git = 'https://github.com/paritytech/substrate.git' }
chain-spec = { package = "substrate-chain-spec", git = 'https://github.com/darwinia-network/substrate.git' }
system = { package = "srml-system", git = 'https://github.com/darwinia-network/substrate.git' }
transaction-payment = { package = "srml-transaction-payment", git = 'https://github.com/darwinia-network/substrate.git' }
node-rpc = { path = "../rpc" }
substrate-rpc = { package = "substrate-rpc", git = 'https://github.com/paritytech/substrate.git' }
client_db = { package = "substrate-client-db", git = 'https://github.com/paritytech/substrate.git', features = ["kvdb-rocksdb"] }
babe = { package = "substrate-consensus-babe", git = 'https://github.com/paritytech/substrate.git' }
babe-primitives = { package = "substrate-consensus-babe-primitives", git = 'https://github.com/paritytech/substrate.git' }
grandpa_primitives = { package = "substrate-finality-grandpa-primitives", git = 'https://github.com/paritytech/substrate.git' }
im-online = { package = "srml-im-online", git = 'https://github.com/paritytech/substrate.git', default-features = false }
sr-authority-discovery = { package = "srml-authority-discovery", git = 'https://github.com/paritytech/substrate.git', default-features = false }
authority-discovery = { package = "substrate-authority-discovery", git = 'https://github.com/paritytech/substrate.git' }
offchain = { package = "substrate-offchain", git = 'https://github.com/paritytech/substrate.git' }
substrate-rpc = { package = "substrate-rpc", git = 'https://github.com/darwinia-network/substrate.git' }
client_db = { package = "substrate-client-db", git = 'https://github.com/darwinia-network/substrate.git', features = ["kvdb-rocksdb"] }
babe = { package = "substrate-consensus-babe", git = 'https://github.com/darwinia-network/substrate.git' }
babe-primitives = { package = "substrate-consensus-babe-primitives", git = 'https://github.com/darwinia-network/substrate.git' }
grandpa_primitives = { package = "substrate-finality-grandpa-primitives", git = 'https://github.com/darwinia-network/substrate.git' }
im-online = { package = "srml-im-online", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
sr-authority-discovery = { package = "srml-authority-discovery", git = 'https://github.com/darwinia-network/substrate.git', default-features = false }
authority-discovery = { package = "substrate-authority-discovery", git = 'https://github.com/darwinia-network/substrate.git' }
offchain = { package = "substrate-offchain", git = 'https://github.com/darwinia-network/substrate.git' }

[dev-dependencies]
consensus-common = { package = "substrate-consensus-common", git = 'https://github.com/paritytech/substrate.git' }
service-test = { package = "substrate-service-test", git = 'https://github.com/paritytech/substrate.git' }
consensus-common = { package = "substrate-consensus-common", git = 'https://github.com/darwinia-network/substrate.git' }
service-test = { package = "substrate-service-test", git = 'https://github.com/darwinia-network/substrate.git' }

[build-dependencies]
cli = { package = "substrate-cli", git = 'https://github.com/paritytech/substrate.git' }
cli = { package = "substrate-cli", git = 'https://github.com/darwinia-network/substrate.git' }
structopt = "0.3.3"
Loading