Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
Merge pull request #12 from scs/brenzi-private-tx
Browse files Browse the repository at this point in the history 
bump to upstream 9b08e7ff
  • Loading branch information
@brenzi
brenzi authored Sep 27, 2019
2 parents 68a7d47 + 2d19d99 commit 9ff29b9
Show file tree
Hide file tree
Showing 34 changed files with 7,100 additions and 9,693 deletions.
3,553 changes: 2,165 additions & 1,388 deletions Cargo.lock
View file

Large diffs are not rendered by default.

152 changes: 88 additions & 64 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,115 @@
[package]
name = "substratee-node"
version = "4.0.1"
authors = ["Supercomputing Systems AG <[email protected]>"]
build = "build.rs"
edition = "2018"
[profile.release]
panic = 'unwind'
panic = "unwind"

[[bin]]
name = 'substratee-node'
path = 'src/main.rs'
name = "substratee-node"
path = "src/main.rs"


[build-dependencies]
vergen = '3'

[package]
authors = ["Supercomputing Systems AG <[email protected]>"]
build = 'build.rs'
edition = '2018'
name = 'substratee-node'
version = '4.0.0'

# to run cargo test with dev-dependencies it must be part of a workspace
#[workspace]
#members = [ 'runtime',
# 'host_calls']
#members = [ "runtime",
# "host_calls"]

[dependencies]
derive_more = "0.14.0"
exit-future = '0.1'
futures = '0.1'
log = '0.4'
parity-codec = '3.3'
parking_lot = "0.8.0"
tokio = '0.1'
trie-root = '0.12.2'
futures = "0.1"
ctrlc = { version = "3.0", features = ["termination"] }
log = "0.4"
tokio = "0.1"
exit-future = "0.1"
parking_lot = "0.9.0"
codec = { package = "parity-scale-codec", version = "1.0.0" }
trie-root = "0.15.2"

[dependencies.basic-authorship]
git = 'https://github.com/paritytech/substrate'
package = 'substrate-basic-authorship'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
[dependencies.sr-io]
git = "https://github.com/paritytech/substrate"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.substrate-cli]
git = "https://github.com/paritytech/substrate"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.consensus]
git = 'https://github.com/paritytech/substrate'
package = 'substrate-consensus-aura'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
[dependencies.primitives]
git = "https://github.com/paritytech/substrate"
package = "substrate-primitives"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.ctrlc]
features = ['termination']
version = '3.0'
[dependencies.substrate-executor]
git = "https://github.com/paritytech/substrate"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.substrate-service]
git = "https://github.com/paritytech/substrate"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.inherents]
git = 'https://github.com/paritytech/substrate'
package = 'substrate-inherents'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
git = "https://github.com/paritytech/substrate"
package = "substrate-inherents"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.network]
git = 'https://github.com/paritytech/substrate'
package = 'substrate-network'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
[dependencies.transaction-pool]
git = "https://github.com/paritytech/substrate"
package = "substrate-transaction-pool"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.substratee-node-runtime]
path = 'runtime'
[dependencies.network]
git = "https://github.com/paritytech/substrate"
package = "substrate-network"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.babe]
git = "https://github.com/paritytech/substrate"
package = "substrate-consensus-babe"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.babe-primitives]
git = "https://github.com/paritytech/substrate"
package = "substrate-consensus-babe-primitives"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.grandpa]
git = "https://github.com/paritytech/substrate"
package = "substrate-finality-grandpa"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.grandpa-primitives]
git = "https://github.com/paritytech/substrate"
package = "substrate-finality-grandpa-primitives"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.primitives]
git = 'https://github.com/paritytech/substrate'
package = 'substrate-primitives'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
[dependencies.basic-authorship]
git = "https://github.com/paritytech/substrate"
package = "substrate-basic-authorship"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.sr-io]
path = 'sr-tee-io'
[dependencies.contracts]
git = "https://github.com/paritytech/substrate"
package = "srml-contracts"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.substrate-cli]
git = 'https://github.com/paritytech/substrate'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
[dependencies.substratee-node-runtime]
path = "runtime"
features = ["enable_host_calls"]

[dependencies.substrate-client]
git = 'https://github.com/paritytech/substrate'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'
git = "https://github.com/paritytech/substrate"
rev = "9b08e7ff938a45dbec7fcdb854063202e2b0cb48"

[dependencies.substrate-executor]
path = "substratee-executor"
package = 'substrate-executor'
[patch."https://github.com/paritytech/substrate"]
sr-io = { package = "sr-io", path = "sr-tee-io", default-features=false }
substrate-executor = { path = "substratee-executor", default-features=false}

[build-dependencies]
vergen = "3"

[dependencies.substrate-service]
git = 'https://github.com/paritytech/substrate'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'

[dependencies.transaction-pool]
git = 'https://github.com/paritytech/substrate'
package = 'substrate-transaction-pool'
rev = '56b0273fd48b4e742e9da7317bc8e132a740b684'

[patch.'https://github.com/paritytech/substrate']
sr-io = { path = 'sr-tee-io' }
substrate-executor = { path = 'substratee-executor'}
25 changes: 22 additions & 3 deletions build.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
use vergen::{ConstantsFlags, generate_cargo_keys};
use std::{env, path::PathBuf};

use vergen::{generate_cargo_keys, ConstantsFlags};

const ERROR_MSG: &str = "Failed to generate metadata files";

fn main() {
generate_cargo_keys(ConstantsFlags::all()).expect(ERROR_MSG);
println!("cargo:rerun-if-changed=.git/HEAD");
generate_cargo_keys(ConstantsFlags::SHA_SHORT).expect(ERROR_MSG);

let mut manifest_dir = PathBuf::from(
env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is always set by cargo."),
);

while manifest_dir.parent().is_some() {
if manifest_dir.join(".git/HEAD").exists() {
println!(
"cargo:rerun-if-changed={}",
manifest_dir.join(".git/HEAD").display()
);
return;
}

manifest_dir.pop();
}

println!("cargo:warning=Could not find `.git/HEAD` from manifest dir!");
}
Loading

0 comments on commit 9ff29b9

Please sign in to comment.