[Sui CLI] - Support full node #4404
Merged
Conversation
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
4cf6727 to
14c5b86
Compare
4f72b21 to
cc806e1
Compare
oxade
approved these changes
Sep 8, 2022
Comment on lines
+173
to
+179
| (ServerHandle::HttpHandler(handle, addr), "JSON-RPC") | ||
| } | ||
| ServerBuilder::WsBuilder(ws_builder) => { | ||
| let server = ws_builder.build(listen_address).await?; | ||
| let addr = server.local_addr()?; | ||
| let handle = server.start(self.module)?; | ||
| (ServerHandle::WsHandle(handle), addr, "Websocket") | ||
| (ServerHandle::WsHandle(handle, addr), "Websocket") |
There was a problem hiding this comment.
Nit, but please use constant for the strs
| .wallet_sync_api() | ||
| .sync_account_state(player_x) | ||
| .await?; | ||
| if self.client.is_gateway() { |
There was a problem hiding this comment.
We will remove gateway completely right? When?
There was a problem hiding this comment.
yes, we need to do some test to make sure equivocation will rarely happens in a reasonable sized network (20 validators) before we can safely remove the gateway.
Comment on lines
+75
to
+122
| pub async fn new(http: &str, ws: Option<&str>) -> Result<Self, anyhow::Error> { | ||
| let http = HttpClientBuilder::default().build(http)?; | ||
| let ws = if let Some(url) = ws { | ||
| Some(WsClientBuilder::default().build(url).await?) | ||
| } else { | ||
| None | ||
| }; | ||
| let info = Self::get_server_info(&http, &ws).await?; | ||
| Ok(Self { http, ws, info }) | ||
| } | ||
|
|
||
| async fn get_server_info( | ||
| http: &HttpClient, | ||
| ws: &Option<WsClient>, | ||
| ) -> Result<ServerInfo, anyhow::Error> { | ||
| let rpc_spec: Value = http | ||
| .request("rpc.discover", None) | ||
| .await | ||
| .map_err(|e| anyhow!("Fail to connect to the RPC server: {e}"))?; | ||
| let version = rpc_spec | ||
| .pointer("/info/version") | ||
| .and_then(|v| v.as_str()) | ||
| .ok_or_else(|| anyhow!("Fail parsing server version from rpc.discover endpoint."))?; | ||
| let rpc_methods = Self::parse_methods(&rpc_spec)?; | ||
|
|
||
| let subscriptions = if let Some(ws) = ws { | ||
| let rpc_spec: Value = ws | ||
| .request("rpc.discover", None) | ||
| .await | ||
| .map_err(|e| anyhow!("Fail to connect to the Websocket server: {e}"))?; | ||
| Self::parse_methods(&rpc_spec)? | ||
| } else { | ||
| Vec::new() | ||
| }; | ||
| Ok(ServerInfo { | ||
| rpc_methods, | ||
| subscriptions, | ||
| version: version.to_string(), | ||
| }) | ||
| } | ||
|
|
||
| fn parse_methods(server_spec: &Value) -> Result<Vec<String>, anyhow::Error> { | ||
| let methods = server_spec | ||
| .pointer("/methods") | ||
| .and_then(|methods| methods.as_array()) | ||
| .ok_or_else(|| { | ||
| anyhow!("Fail parsing server information from rpc.discover endpoint.") | ||
| })?; |
There was a problem hiding this comment.
Nit. Raw strings like this really bother me :p but it could be okay
…connecting to gateway or fullnode fixed issue #4164 print rpc server's available methods on sui console startup
cc806e1 to
34e5ff4
Compare
|
FYI @brad-mysten @tharbert this PR changed the client.yaml, this might break operations? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rpc, this can be used to point to either gateway or fullnoderpc.discovermethod and determine if the client is connecting to gateway or fullnodetodos: