forked from MystenLabs/sui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[wallet + gateway] refactored wallet to use GatewayClient (MystenLabs…
…#682) * * Added `GatewayClient` type * Refactored wallet to use `GatewayClient` instead of using `ClientAddressManager` directly * Added GatewayType in config for preparation of different gateway types * `ClientAddressManager` now creates client state implicitly * * improve Gateway type display * add docs * fixup after rebase
- Loading branch information
1 parent
9e74c61
commit 47e7bce
Showing
14 changed files
with
367 additions
and
343 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // Copyright (c) 2022, Mysten Labs, Inc. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| use std::collections::BTreeMap; | ||
| use std::fmt::Write; | ||
| use std::fmt::{Display, Formatter}; | ||
| use std::path::PathBuf; | ||
| use std::time::Duration; | ||
|
|
||
| use serde::Deserialize; | ||
| use serde::Serialize; | ||
|
|
||
| use sui_core::authority_client::AuthorityClient; | ||
| use sui_core::client::{ClientAddressManager, GatewayClient}; | ||
| use sui_network::network::NetworkClient; | ||
| use sui_network::transport; | ||
| use sui_types::base_types::AuthorityName; | ||
| use sui_types::committee::Committee; | ||
|
|
||
| use crate::config::AuthorityInfo; | ||
|
|
||
| #[derive(Serialize, Deserialize)] | ||
| #[serde(rename_all = "lowercase")] | ||
| pub enum GatewayType { | ||
| Embedded(EmbeddedGatewayConfig), | ||
| Rest(String), | ||
| } | ||
|
|
||
| impl Display for GatewayType { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
| let mut writer = String::new(); | ||
|
|
||
| match self { | ||
| GatewayType::Embedded(config) => { | ||
| writeln!(writer, "Gateway Type : Embedded")?; | ||
| writeln!( | ||
| writer, | ||
| "Client state DB folder path : {:?}", | ||
| config.db_folder_path | ||
| )?; | ||
| let authorities = config | ||
| .authorities | ||
| .iter() | ||
| .map(|info| format!("{}:{}", info.host, info.base_port)); | ||
| writeln!( | ||
| writer, | ||
| "Authorities : {:?}", | ||
| authorities.collect::<Vec<_>>() | ||
| )?; | ||
| } | ||
| GatewayType::Rest(url) => { | ||
| writeln!(writer, "Gateway Type : RestAPI")?; | ||
| writeln!(writer, "Gateway URL : {}", url)?; | ||
| } | ||
| } | ||
| write!(f, "{}", writer) | ||
| } | ||
| } | ||
|
|
||
| impl GatewayType { | ||
| pub fn init(&self) -> GatewayClient { | ||
| match self { | ||
| GatewayType::Embedded(config) => { | ||
| let path = config.db_folder_path.clone(); | ||
| let committee = config.make_committee(); | ||
| let authority_clients = config.make_authority_clients(); | ||
| Box::new(ClientAddressManager::new( | ||
| path, | ||
| committee, | ||
| authority_clients, | ||
| )) | ||
| } | ||
| _ => { | ||
| panic!("Unsupported gateway type") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Serialize, Deserialize)] | ||
| pub struct EmbeddedGatewayConfig { | ||
| pub authorities: Vec<AuthorityInfo>, | ||
| pub send_timeout: Duration, | ||
| pub recv_timeout: Duration, | ||
| pub buffer_size: usize, | ||
| pub db_folder_path: PathBuf, | ||
| } | ||
|
|
||
| impl EmbeddedGatewayConfig { | ||
| pub fn make_committee(&self) -> Committee { | ||
| let voting_rights = self | ||
| .authorities | ||
| .iter() | ||
| .map(|authority| (authority.name, 1)) | ||
| .collect(); | ||
| Committee::new(voting_rights) | ||
| } | ||
|
|
||
| pub fn make_authority_clients(&self) -> BTreeMap<AuthorityName, AuthorityClient> { | ||
| let mut authority_clients = BTreeMap::new(); | ||
| for authority in &self.authorities { | ||
| let client = AuthorityClient::new(NetworkClient::new( | ||
| authority.host.clone(), | ||
| authority.base_port, | ||
| self.buffer_size, | ||
| self.send_timeout, | ||
| self.recv_timeout, | ||
| )); | ||
| authority_clients.insert(authority.name, client); | ||
| } | ||
| authority_clients | ||
| } | ||
| } | ||
|
|
||
| impl Default for EmbeddedGatewayConfig { | ||
| fn default() -> Self { | ||
| Self { | ||
| authorities: vec![], | ||
| send_timeout: Duration::from_micros(4000000), | ||
| recv_timeout: Duration::from_micros(4000000), | ||
| buffer_size: transport::DEFAULT_MAX_DATAGRAM_SIZE, | ||
| db_folder_path: Default::default(), | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.