Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ecdf920
add design document with some mermaid diagrams
brenzi Oct 11, 2023
347e187
support enclave signing with changing keypairs at runtime
brenzi Oct 11, 2023
81e94dd
tame nervous polling of not yet finalized block
brenzi Oct 11, 2023
6ddd043
shard vault account creation works
brenzi Oct 11, 2023
156aac3
prepare vault account getter. not working yet
brenzi Oct 11, 2023
f1d3d77
fix build and add trusted_call dummy for unshielding
brenzi Oct 12, 2023
9911098
fix transfer call indexes
brenzi Oct 12, 2023
ead3662
unshieldind dummy with real vault account and proxy call
brenzi Oct 12, 2023
b20d978
await vault account creation before registering proxy
brenzi Oct 12, 2023
4524b9f
proxied unshielding call encodes correctly and would be executed if t…
brenzi Oct 12, 2023
6587f1b
start MU_RA doc diagrams and refactor namings for improved readability
brenzi Oct 12, 2023
d5ce0c7
refactoring MU RA functions for better readability. try to extract cl…
brenzi Oct 12, 2023
cd3562d
logging pubkey of counterparty now during MU RA. but seems skip_ra wo…
brenzi Oct 12, 2023
36bdc5c
add client account to MU RA request
brenzi Oct 13, 2023
b5da3a2
starting to modularize vault logic
brenzi Oct 13, 2023
ed26be7
secondary worker is registered as a vault proxy now
brenzi Oct 13, 2023
da6bea0
Merge remote-tracking branch 'origin/master' into ab/proxied-vault-ac…
brenzi Oct 13, 2023
b72c063
cleanup
brenzi Oct 13, 2023
4d2c000
clippy
brenzi Oct 13, 2023
9bc2e60
doc cleanup
brenzi Oct 13, 2023
757c07a
doc pimp
brenzi Oct 13, 2023
2b7ed16
cleanup
brenzi Oct 13, 2023
bb69ebd
reverting polling fix which is solved in another PR
brenzi Oct 24, 2023
42fac49
fix diagram bug
brenzi Oct 24, 2023
f5acb2d
fix mock test
brenzi Oct 24, 2023
6e03fff
avoid panic if add_shard_vault_proxy fails
brenzi Oct 25, 2023
2109bd2
skip shard vault stuff for offchain-worker
brenzi Oct 26, 2023
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
Prev Previous commit
Next Next commit
clippy
  • Loading branch information
brenzi committed Oct 13, 2023
commit 4d2c0000f3d85f1e4db2e54d872dd582ecacab12
18 changes: 8 additions & 10 deletions service/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -599,17 +599,15 @@ fn start_worker<E, T, D, InitializationHandler, WorkerModeProvider>(
"shard vault account is already initialized in state: {}",
shard_vault.to_ss58check()
);
} else if we_are_primary_validateer {
println!("initializing proxied shard vault account now");
enclave.init_proxied_shard_vault(shard).unwrap();
println!(
"initialized shard vault account: : {}",
enclave.get_ecc_vault_pubkey(shard).unwrap().to_ss58check()
);
} else {
if we_are_primary_validateer {
println!("initializing proxied shard vault account now");
enclave.init_proxied_shard_vault(shard).unwrap();
println!(
"initialized shard vault account: : {}",
enclave.get_ecc_vault_pubkey(shard).unwrap().to_ss58check()
);
} else {
panic!("no vault account has been initialized and we are not the primary worker");
}
panic!("no vault account has been initialized and we are not the primary worker");
}
}

Expand Down
14 changes: 6 additions & 8 deletions service/src/ocall_bridge/worker_on_chain_ocall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,12 @@ where
e
);
}
} else {
if let Err(e) = api.submit_opaque_extrinsic(&call.encode().into()) {
error!(
"Could not send extrinsic to node: {:?}, error: {:?}",
serde_json::to_string(&call),
e
);
}
} else if let Err(e) = api.submit_opaque_extrinsic(&call.encode().into()) {
error!(
"Could not send extrinsic to node: {:?}, error: {:?}",
serde_json::to_string(&call),
e
);
}
}
}
Expand Down