Bump deps (#276)

* re-introduce substrate branch-ids * bump substrate@8a9a8f * bump substrate-api-client/ substraTEE-node/ sgx-runtime
integritee-network · Jun 29, 2021 · 96aef7f · 96aef7f
1 parent 3f4bc86
commit 96aef7f
Show file tree

Hide file tree

Showing 24 changed files with 1,358 additions and 1,030 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -9,7 +9,7 @@ log = "0.4"
 env_logger = "0.7"
 hex = "0.4.2"
 json = "0.12.0"
-substrate-bip39 = "0.3.1"
+substrate-bip39 = "0.4.2"
 tiny-bip39 = "0.6.2"
 serde_json = "1.0"
 clap = "2.33"
@@ -24,9 +24,11 @@ sgx_crypto_helper = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-
 
 [dependencies.substrate-api-client]
 git = "https://github.com/scs/substrate-api-client"
+branch = "master"
 
 [dependencies.substrate-client-keystore]
 git = "https://github.com/scs/substrate-api-client"
+branch = "master"
 
 [dependencies.serde]
 features = ["derive"]
@@ -40,24 +42,29 @@ version = "2.0.0"
 
 [dependencies.sp-runtime]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 
 [dependencies.sc-keystore]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 
 [dependencies.pallet-balances]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 default-features=false
 
 [dependencies.frame-system]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 default-features=false
 
 [dependencies.my-node-runtime]
 git = "https://github.com/scs/substraTEE-node"
+branch = "master"
 package = "substratee-node-runtime"
 
 [dependencies.substratee-worker-primitives]
@@ -77,14 +84,17 @@ path = "../worker/worker-api"
 
 [dependencies.sp-keyring]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 
 [dependencies.sp-application-crypto]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 
 [dependencies.sp-core]
 git = "https://github.com/paritytech/substrate.git"
+branch = "master"
 version = "3.0.0"
 
 #[patch.crates-io]

diff --git a/client/src/main.rs b/client/src/main.rs
@@ -62,7 +62,7 @@ use substrate_api_client::{
     Api, XtStatus,
 };
 
-use substrate_client_keystore::LocalKeystore;
+use substrate_client_keystore::{LocalKeystore, KeystoreExt};
 use substratee_stf::{ShardIdentifier, TrustedCallSigned, TrustedOperation};
 use substratee_worker_api::direct_client::DirectApi as DirectWorkerApi;
 use substratee_api_client_extensions::SubstrateeRegistryApi;
@@ -715,7 +715,7 @@ fn listen(matches: &ArgMatches<'_>) {
                                 }
                             }
                         },*/
-                        Event::substratee_registry(ee) => {
+                        Event::SubstrateeRegistry(ee) => {
                             println!(">>>>>>>>>> substraTEE event: {:?}", ee);
                             count += 1;
                             match &ee {
@@ -818,7 +818,7 @@ where
         if let Ok(evts) = _events {
             for evr in &evts {
                 info!("received event {:?}", evr.event);
-                if let Event::substratee_registry(pe) = &evr.event {
+                if let Event::SubstrateeRegistry(pe) = &evr.event {
                     if let my_node_runtime::substratee_registry::RawEvent::CallConfirmed(
                         sender,
                         payload,
@@ -861,6 +861,7 @@ fn get_pair_from_str(account: &str) -> sr25519::AppPair {
                 .key_pair::<sr25519::AppPair>(
                     &sr25519::Public::from_ss58check(account).unwrap().into(),
                 )
+                .unwrap()
                 .unwrap();
             drop(store);
             _pair