Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2ceb10d
wip re-introduce branch-ids and bump substrate@8a9a8f170f556beb7c86e9…
clangenb Jun 24, 2021
c35ac91
bump sgx-runtime
clangenb Jun 25, 2021
d055614
[enclave/chain_relay] fix: remove branch-id for wrong dep
clangenb Jun 25, 2021
0e2edc8
[primitives/node] define SignedBlock ourselves, as its no longer defi…
clangenb Jun 25, 2021
62361dd
[worker & clien] update code for version bumps
clangenb Jun 25, 2021
5874e35
bump toolchain 2021-05-11
clangenb Jun 25, 2021
7054694
[enclave] fix some dep sources
clangenb Jun 25, 2021
5a85cae
[worker] bump sgx-deps
clangenb Jun 25, 2021
63ac4fe
[enclave] bump deps
clangenb Jun 25, 2021
a788edd
[enclave] remove stabilized resolver feature flag
clangenb Jun 25, 2021
8577e67
[enclave] fix toolchain flag. remove unnecessary stf toolchain file. …
clangenb Jun 25, 2021
24b78c2
[enclave] change api-client dep to get no_std hex::decode
clangenb Jun 25, 2021
acf3014
[enclave/top/pool] update error fmt for new rustc
clangenb Jun 25, 2021
0da17fa
[enclave/chain_relay] update grandpa verification for multiple consen…
clangenb Jun 25, 2021
a4c2d58
Cargo.lock (fmt changes after rustc update)
clangenb Jun 25, 2021
ec4adaf
fix cherry pick errors
clangenb Jun 25, 2021
c412bf4
Cargo.lock: minor stuff after cherry picks
clangenb Jun 25, 2021
55f52a8
[enclave/cert] fix handling of unaligned_references in packed fields.
clangenb Jun 25, 2021
78eb326
[enclave/top_pool] fix warning
clangenb Jun 25, 2021
9fc8573
bump api-client
clangenb Jun 29, 2021
25dfdb6
bump integritee-node-runtime and sgx-runtime
clangenb Jun 29, 2021
970b898
bump json-rpc and thereby remove duplicate sp-std dep
clangenb Jun 29, 2021
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
1,649 changes: 904 additions & 745 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"]
Expand All @@ -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]
Expand All @@ -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]
Expand Down
7 changes: 4 additions & 3 deletions client/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -715,7 +715,7 @@ fn listen(matches: &ArgMatches<'_>) {
}
}
},*/
Event::substratee_registry(ee) => {
Event::SubstrateeRegistry(ee) => {
println!(">>>>>>>>>> substraTEE event: {:?}", ee);
count += 1;
match &ee {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Loading