Merge pull request #3 from darwinia-network/master

fetch new
darwinia-network · Sep 2, 2019 · 45189e5 · 45189e5
2 parents b295767 + cd4d244
commit 45189e5
Show file tree

Hide file tree

Showing 42 changed files with 3,918 additions and 4,412 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,6 @@
 .idea
 !node/runtime/wasm/target/wasm32-unknown-unknown/release/*.compact.wasm
 
+test-client
+
+.DS_Store
diff --git a/.x86_64-unknown-linux-gnu_env_cross_compile b/.x86_64-unknown-linux-gnu_env_cross_compile
@@ -0,0 +1,19 @@
+# https://timryan.org/2018/07/27/cross-compiling-linux-binaries-from-macos.html
+
+# brew tap SergioBenitez/osxct
+# brew install x86_64-unknown-linux-gnu
+
+# Linker for the target platform
+# (cc can also be updated using .cargo/config)
+export TARGET_CC="x86_64-unknown-linux-gnu-gcc"
+
+export LINUX_GCC_TARGET_PATH="/usr/local/Cellar/x86_64-unknown-linux-gnu/7.2.0/toolchain/lib/gcc/x86_64-unknown-linux-gnu/7.2.0"
+
+# Library headers to link against
+export TARGET_CFLAGS="-I $LINUX_GCC_TARGET_PATH/include -isystem /usr/local/Cellar/x86_64-unknown-linux-gnu/7.2.0/toolchain/x86_64-unknown-linux-gnu/sysroot/usr/include"
+# Libraries (shared objects) to link against
+export LD_LIBRARY_PATH="$LINUX_GCC_TARGET_PATH;/usr/local/Cellar/x86_64-unknown-linux-gnu/7.2.0/toolchain/x86_64-unknown-linux-gnu/sysroot/usr/lib"
+
+# openssl-sys specific build flags
+export OPENSSL_DIR="/usr/local/Cellar/openssl/1.0.2r"
+export OPENSSL_LIB_DIR="/usr/local/Cellar/openssl/1.0.2r/lib"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,14 +50,14 @@ path = 'node/src/main.rs'
 
 [workspace]
 members = [
+#    "test-client",
 	"node/cli",
     "node/executor",
     "node/primitives",
     "node/runtime",
     "node/rpc-client",
     "srml/staking",
-    "srml/token/ring",
-    "srml/token/kton",
+    "srml/kton",
     "srml/support",
     "srml/aura",
 	"srml/try",
@@ -66,9 +66,9 @@ members = [
 exclude = ["node/runtime/wasm"]
 
 [package]
-authors = ['Parity Technologies <admin@parity.io>']
+authors = ['Darwinia Network <hello@darwinia.network>']
 build = 'build.rs'
 edition = '2018'
-name = 'darwinia-poc1'
-version = '0.1.0'
+name = 'darwinia-crayfish'
+version = '0.3.0'
 
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -12,7 +12,7 @@ tokio = "0.1.7"
 futures = "0.1"
 exit-future = "0.1"
 cli = { package = "substrate-cli", git = 'https://github.com/paritytech/substrate.git' }
-parity-codec = { version = "3.3" }
+parity-codec = { version = "4.1.1" }
 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' }
@@ -39,6 +39,7 @@ timestamp = { package = "srml-timestamp", git = 'https://github.com/paritytech/s
 rand = "0.6"
 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 }
 backtrace = "0.3"
 reqwest = "0.9.5"
 serde = "1.0"